fix sizing of extra control

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

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 4e52a9ad23bf0cdad791d1d01cbaa4a1811fc88e..dce90cc97da7913461841bc6573733aaf70223be 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        nativdlg.cpp
+// Name:        samples/nativdlg/nativdlg.cpp

 // Purpose:     Native Windows dialog sample
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Native Windows dialog sample
 // Author:      Julian Smart
 // Modified by:


@@ -32,6 +32,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

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

   // Create the main frame window
   MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 
   // Create the main frame window
   MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 


@@ -82,7 +85,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {

-#if ( defined(__WXOS2__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXPM__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)

     MyDialog dialog;
     if (dialog.LoadNativeDialog(this, _T("dialog1")))
     {
     MyDialog dialog;
     if (dialog.LoadNativeDialog(this, _T("dialog1")))
     {


@@ -108,5 +111,3 @@ void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
   EndModal(wxID_CANCEL);
 }
 {
   EndModal(wxID_CANCEL);
 }

-
-