diff options
| author | Joakim Verona <joakim@verona.se> | 2012-05-21 09:04:41 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2012-05-21 09:04:41 +0200 |
| commit | aec4aaf7216eb43c374f7b065e518368adf316b7 (patch) | |
| tree | 9f5e3389fac92b229b515dd63ff86f9e003c8ca2 /src/emacsgtkfixed.c | |
| parent | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (diff) | |
| download | emacs-aec4aaf7216eb43c374f7b065e518368adf316b7.tar.gz emacs-aec4aaf7216eb43c374f7b065e518368adf316b7.tar.bz2 emacs-aec4aaf7216eb43c374f7b065e518368adf316b7.zip | |
reinstal emocsfiked changes
Diffstat (limited to 'src/emacsgtkfixed.c')
| -rw-r--r-- | src/emacsgtkfixed.c | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 194d3d3879f..e45cc716a31 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -30,28 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_XWIDGETS #include "xwidget.h" #endif - -#define EMACS_TYPE_FIXED emacs_fixed_get_type () -#define EMACS_FIXED(obj) \ - G_TYPE_CHECK_INSTANCE_CAST (obj, EMACS_TYPE_FIXED, EmacsFixed) - -typedef struct _EmacsFixed EmacsFixed; -typedef struct _EmacsFixedPrivate EmacsFixedPrivate; -typedef struct _EmacsFixedClass EmacsFixedClass; - -struct _EmacsFixed -{ - GtkFixed container; - - /*< private >*/ - EmacsFixedPrivate *priv; -}; - -struct _EmacsFixedClass -{ - GtkFixedClass parent_class; -}; - struct _EmacsFixedPrivate { struct frame *f; @@ -64,7 +42,6 @@ static void emacs_fixed_get_preferred_width (GtkWidget *widget, static void emacs_fixed_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural); -static GType emacs_fixed_get_type (void); G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED) #ifdef HAVE_XWIDGETS @@ -187,8 +164,10 @@ static void emacs_fixed_class_init (EmacsFixedClass *klass) { GtkWidgetClass *widget_class; + GtkFixedClass *fixed_class; widget_class = (GtkWidgetClass*) klass; + fixed_class = (GtkFixedClass*) klass; widget_class->get_preferred_width = emacs_fixed_get_preferred_width; widget_class->get_preferred_height = emacs_fixed_get_preferred_height; @@ -198,6 +177,12 @@ emacs_fixed_class_init (EmacsFixedClass *klass) g_type_class_add_private (klass, sizeof (EmacsFixedPrivate)); } +static GType +emacs_fixed_child_type (GtkFixed *container) +{ + return GTK_TYPE_WIDGET; +} + static void emacs_fixed_init (EmacsFixed *fixed) { |