implemented GetBestSize() (TODO: make this available in generic version as well)

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 0938985f32bf13063028d160f1cfd6099eda313c..0f47a275189e7375497bdae72a8008f3b1fac1d1 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 
 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface
-#endif
-

 // helper structure that holds class that holds GtkIMContext object and
 // some additional data needed for key events processing
 struct wxGtkIMData;
 // helper structure that holds class that holds GtkIMContext object and
 // some additional data needed for key events processing
 struct wxGtkIMData;


@@ -208,13 +203,13 @@ public:
 
 #ifdef __WXGTK20__
     wxGtkIMData         *m_imData;
 
 #ifdef __WXGTK20__
     wxGtkIMData         *m_imData;

-#else
-#if HAVE_XIM && !defined(__WXGTK20__)
+#else // GTK 1
+#ifdef HAVE_XIM

     // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
     // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;

-#endif
-#endif
+#endif // HAVE_XIM
+#endif // GTK 2/1

 
 #ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)
 
 #ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)