Allow headers to be compiled in Objective-C++ mode

[wxWidgets.git] / include / wx / gtk1 / private.h

diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index 877dd4b56191de5cb0f55a2020b95c61fbd311c4..d63519da52a7d34d084680bc0daf9bc942f76410 100644 (file)
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -6,7 +6,7 @@
 // Created:     12.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     12.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_PRIVATE_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_PRIVATE_H_


@@ -61,20 +61,6 @@
     #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
 #endif
 
     #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)
 // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
 // previous GTK+ versions but no more
 #if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)