Imported Upstream version 3.4.0

[glabels] / src / view-ellipse.h

diff --git a/src/view-ellipse.h b/src/view-ellipse.h
index b6d6aae2f81ce3ea6a1813fb047adfa670e69afd..4c8ed7b0e6aa023f6e0404714705255515e0f76b 100644 (file)
--- a/src/view-ellipse.h
+++ b/src/view-ellipse.h
@@ -1,81 +1,62 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  view_ellipse.h:  GLabels label ellipse object view
+ *  view-ellipse.h
+ *  Copyright (C) 2001-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2001-2007  Jim Evins <evins@snaught.com>.
+ *  This file is part of gLabels.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __VIEW_ELLIPSE_H__
 #define __VIEW_ELLIPSE_H__
 
-#include "view-object.h"
-#include "label-ellipse.h"
-
-G_BEGIN_DECLS
-
-
-#define GL_TYPE_VIEW_ELLIPSE            (gl_view_ellipse_get_type ())
-#define GL_VIEW_ELLIPSE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_VIEW_ELLIPSE, glViewEllipse))
-#define GL_VIEW_ELLIPSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW_ELLIPSE, glViewEllipseClass))
-#define GL_IS_VIEW_ELLIPSE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_VIEW_ELLIPSE))
-#define GL_IS_VIEW_ELLIPSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_VIEW_ELLIPSE))
-
-typedef struct _glViewEllipse          glViewEllipse;
-typedef struct _glViewEllipseClass     glViewEllipseClass;
-
-typedef struct _glViewEllipsePrivate   glViewEllipsePrivate;
-
-struct _glViewEllipse {
-       glViewObject          parent_object;
+#include "view.h"
 
-       glViewEllipsePrivate *priv;
-};
 
-struct _glViewEllipseClass {
-       glViewObjectClass     parent_class;
-};
-
-
-GType          gl_view_ellipse_get_type (void) G_GNUC_CONST;
-
-glViewObject  *gl_view_ellipse_new      (glLabelEllipse *object,
-                                         glView     *view);
+G_BEGIN_DECLS
 
 
 /* cursor for creating ellipse objects */
-GdkCursor *gl_view_ellipse_get_create_cursor (void);
+GdkCursor *gl_view_ellipse_get_create_cursor           (void);
 
 /* Object creation handlers. */
-void       gl_view_ellipse_create_button_press_event   (glView *view,
-                                                        gdouble x,
-                                                        gdouble y);
+void       gl_view_ellipse_create_button_press_event   (glView  *view,
+                                                        gdouble  x,
+                                                        gdouble  y);
 
-void       gl_view_ellipse_create_motion_event         (glView *view,
-                                                        gdouble x,
-                                                        gdouble y);
+void       gl_view_ellipse_create_motion_event         (glView  *view,
+                                                        gdouble  x,
+                                                        gdouble  y,
+                                                        gboolean circle);
 
-void       gl_view_ellipse_create_button_release_event (glView *view,
-                                                        gdouble x,
-                                                        gdouble y);
+void       gl_view_ellipse_create_button_release_event (glView  *view,
+                                                        gdouble  x,
+                                                        gdouble  y,
+                                                        gboolean circle);
 
 
 G_END_DECLS
 
 #endif /* __VIEW_ELLIPSE_H__ */
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */