added wxGetTopLevelParent()

[wxWidgets.git] / samples / widgets / widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index d8994358665d9e3d3fb8e43e0ecaa85f639fc414..af1bb212723d5ebab60747f5258901748b0a45e9 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -28,7 +28,6 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"

-    #include "wx/panel.h"

     #include "wx/frame.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/frame.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"


@@ -192,17 +191,24 @@ END_EVENT_TABLE()
 
 bool WidgetsApp::OnInit()
 {
 
 bool WidgetsApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return FALSE;
+

     // the reason for having these ifdef's is that I often run two copies of
     // this sample side by side and it is useful to see which one is which
     wxString title;
 #if defined(__WXUNIVERSAL__)
     // the reason for having these ifdef's is that I often run two copies of
     // this sample side by side and it is useful to see which one is which
     wxString title;
 #if defined(__WXUNIVERSAL__)

-    title = _T("wxUniv/")
+    title = _T("wxUniv/");

 #endif
 
 #if defined(__WXMSW__)
     title += _T("wxMSW");
 #elif defined(__WXGTK__)
     title += _T("wxGTK");
 #endif
 
 #if defined(__WXMSW__)
     title += _T("wxMSW");
 #elif defined(__WXGTK__)
     title += _T("wxGTK");

+#elif defined(__WXMAC__)
+    title += _T("wxMAC");
+#elif defined(__WXMOTIF__)
+    title += _T("wxMOTIF");

 #else
     title += _T("wxWindows");
 #endif
 #else
     title += _T("wxWindows");
 #endif


@@ -249,6 +255,8 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
                              );
     m_lboxLog = new wxListBox(m_panel, -1);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);
                              );
     m_lboxLog = new wxListBox(m_panel, -1);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);

+    sizerDown->SetMinSize(100, 150);
+

     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));
     sizerBtns->Add(btn);
     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));
     sizerBtns->Add(btn);