always let the multiline text control process the Enter key presses

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

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index da3ed2cc91b4f37849857e3762588567f8ca9bdd..29e80d1b9257e99a1da10cce44ceaac955ac92be 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -26,6 +26,7 @@
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/log.h"
 
     #include "wx/button.h"
     #include "wx/log.h"
 
     #include "wx/button.h"


@@ -38,7 +39,7 @@
 #include "wx/sizer.h"
 
 #include "widgets.h"
 #include "wx/sizer.h"
 
 #include "widgets.h"

-
+#if 1

 #include "icons/button.xpm"
 
 // ----------------------------------------------------------------------------
 #include "icons/button.xpm"
 
 // ----------------------------------------------------------------------------


@@ -111,8 +112,8 @@ protected:
     wxTextCtrl *m_textLabel;
 
 private:
     wxTextCtrl *m_textLabel;
 
 private:

-    DECLARE_EVENT_TABLE();
-    DECLARE_WIDGETS_PAGE(ButtonWidgetsPage);
+    DECLARE_EVENT_TABLE()
+    DECLARE_WIDGETS_PAGE(ButtonWidgetsPage)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -219,7 +220,7 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
     sizerRight->Add(0, 0, 1, wxCENTRE);
     sizerRight->Add(m_button, 1, wxCENTRE);
     sizerRight->Add(0, 0, 1, wxCENTRE);
     sizerRight->Add(0, 0, 1, wxCENTRE);
     sizerRight->Add(m_button, 1, wxCENTRE);
     sizerRight->Add(0, 0, 1, wxCENTRE);

-    sizerRight->SetMinSize(250, 0);
+    sizerRight->SetMinSize(150, 0);

     m_sizerButton = sizerRight; // save it to modify it later
 
     // the 3 panes panes compose the window
     m_sizerButton = sizerRight; // save it to modify it later
 
     // the 3 panes panes compose the window


@@ -369,3 +370,4 @@ void ButtonWidgetsPage::OnButton(wxCommandEvent& event)
     wxLogMessage(_T("Test button clicked."));
 }
 
     wxLogMessage(_T("Test button clicked."));
 }
 

+#endif
\ No newline at end of file