Committed a couple of IPC changes I forgot to do

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 2352b90c171c8de1d5ef8ceac87efc3db6f27ced..59a9769b1b5fe65d4d3e0ad0b006d380ff0c9c7e 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_BASE_
 #define _WX_WINDOW_H_BASE_
 
 #ifndef _WX_WINDOW_H_BASE_
 #define _WX_WINDOW_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "windowbase.h"
 #endif
 
     #pragma interface "windowbase.h"
 #endif
 


@@ -951,9 +951,9 @@ protected:
     virtual wxBorder GetDefaultBorder() const;
 
     // get the default size for the new window if no explicit size given
     virtual wxBorder GetDefaultBorder() const;
 
     // get the default size for the new window if no explicit size given

-    // FIXME why 40 and not 20, 10 or ...? GTK can crash with 40. RR.
-    static int WidthDefault(int w) { return w == -1 ? 40 : w; }
-    static int HeightDefault(int h) { return h == -1 ? 40 : h; }
+    // FIXME why 20 and not 30, 10 or ...?
+    static int WidthDefault(int w) { return w == -1 ? 20 : w; }
+    static int HeightDefault(int h) { return h == -1 ? 20 : h; }

 
     // set the best size for the control if the default size was given:
     // replaces the fields of size == -1 with the best values for them and
 
     // set the best size for the control if the default size was given:
     // replaces the fields of size == -1 with the best values for them and