allow adjusting the combo button size (patch 1489452)

[wxWidgets.git] / samples / xrc / xrcdemo.cpp

diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp
index 824477921d97e8cb7fdd780103be4e4610900df9..a6a8a1a7c65c68952323f0ef668f27b4c62901e0 100644 (file)
--- a/samples/xrc/xrcdemo.cpp
+++ b/samples/xrc/xrcdemo.cpp
@@ -7,14 +7,6 @@
 // Licence:     wxWindows licence
 //-----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// GCC implementation
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUG__
-    #pragma implementation "xrcdemo.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // Standard wxWidgets headers
 //-----------------------------------------------------------------------------
@@ -75,18 +67,18 @@ bool MyApp::OnInit()
     // you want PNGs, then add a PNG handler, etc. See wxImage::AddHandler()
     // documentation for the types of image handlers available.
     wxImage::AddHandler(new wxXPMHandler);
-    
+
     // Initialize all the XRC handlers. Always required (unless you feel like
     // going through and initializing a handler of each control type you will
     // be using (ie initialize the spinctrl handler, initialize the textctrl
     // handler). However, if you are only using a few control types, it will
     // save some space to only initialize the ones you will be using. See
     // wxXRC docs for details.
-    wxXmlResource::Get()->InitAllHandlers();    
-      
+    wxXmlResource::Get()->InitAllHandlers();
+
     // Load all of the XRC files that will be used. You can put everything
-    // into one giant XRC file if you wanted, but then they become more 
-    // diffcult to manage, and harder to reuse in later projects.   
+    // into one giant XRC file if you wanted, but then they become more
+    // diffcult to manage, and harder to reuse in later projects.
     // The menubar
     wxXmlResource::Get()->Load(wxT("rc/menu.xrc"));
     // The toolbar
@@ -100,7 +92,7 @@ bool MyApp::OnInit()
     // Frame example
     wxXmlResource::Get()->Load(wxT("rc/frame.xrc"));
     // Uncentered example
-    wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc"));    
+    wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc"));
     // Custom class example
     wxXmlResource::Get()->Load(wxT("rc/custclas.xrc"));
     // wxArtProvider example
@@ -110,15 +102,15 @@ bool MyApp::OnInit()
     // Variable expansion example
     wxXmlResource::Get()->Load(wxT("rc/variable.xrc"));
 
-    // Make an instance of your derived frame. Passing NULL (the default value 
-    // of MyFrame's constructor is NULL) as the frame doesn't have a frame
-    // since it is the first window. 
+    // Make an instance of your derived frame. Passing NULL (the default value
+    // of MyFrame's constructor is NULL) as the frame doesn't have a parent
+    // since it is the main application window.
     MyFrame *frame = new MyFrame();
-    
-    // Show the frame.
-    frame->Show(TRUE);
-    
-    // Return TRUE to tell program to continue (FALSE would terminate).
-    return TRUE;
+
+    // Show the frame as it's created initially hidden.
+    frame->Show(true);
+
+    // Return true to tell program to continue (false would terminate).
+    return true;
 }