sds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 9bfc350010d6786172e8655c048d4c736466400f..6429aa80dd2f7eb9fb936884ae82990e1c86f85a 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -219,7 +219,9 @@ bool MyApp::OnInit()
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",
-            x, y, 530, 420);
+            x, y, 540, 430);
+    
+    frame->SetSizeHints( 500, 425 );
 
     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index b507f3e193b610d18361d495963161edb275fb77..021ad974ec5557f07b95059f2abcc0a8e74c0bcb 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -17,7 +17,7 @@
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index b507f3e193b610d18361d495963161edb275fb77..021ad974ec5557f07b95059f2abcc0a8e74c0bcb 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -17,7 +17,7 @@
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system