From adfb70c30f085c7b00468982a6294842ddc9fcb0 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 31 Jan 2003 10:31:54 +0000 Subject: [PATCH] Removed unnecessary SET_STYLE.. macros. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/private.h | 14 -------------- include/wx/gtk1/private.h | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 877dd4b561..621852a75d 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -61,20 +61,6 @@ #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window #endif -// get the font from a style -// -// TODO: GdkFont has been replaced by PangoFontDescription in GTK+ 2.0 -// and we really should use it instead of GdkFont (see also dclient.cpp) -#ifdef __WXGTK20__ - #define GET_STYLE_FONT(style) gtk_style_get_font(style) - #define SET_STYLE_FONT(style, font) gtk_style_set_font(style, font) -#else - #define GET_STYLE_FONT(style) ((style)->font) - #define SET_STYLE_FONT(style, fnt) \ - gdk_font_unref( style->font ); \ - style->font = gdk_font_ref( fnt ) -#endif - // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under // previous GTK+ versions but no more #if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0) diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h index 877dd4b561..621852a75d 100644 --- a/include/wx/gtk1/private.h +++ b/include/wx/gtk1/private.h @@ -61,20 +61,6 @@ #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window #endif -// get the font from a style -// -// TODO: GdkFont has been replaced by PangoFontDescription in GTK+ 2.0 -// and we really should use it instead of GdkFont (see also dclient.cpp) -#ifdef __WXGTK20__ - #define GET_STYLE_FONT(style) gtk_style_get_font(style) - #define SET_STYLE_FONT(style, font) gtk_style_set_font(style, font) -#else - #define GET_STYLE_FONT(style) ((style)->font) - #define SET_STYLE_FONT(style, fnt) \ - gdk_font_unref( style->font ); \ - style->font = gdk_font_ref( fnt ) -#endif - // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under // previous GTK+ versions but no more #if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0) -- 2.45.2