fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 58c55fa2d59443d0c63bb81c2dae7b1599dd063d..914fa1a08b347d7eb210c85dcb5ed7d41d34b660 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -52,7 +52,7 @@
 // control ids
 enum
 {
-    ButtonPage_Reset = 100,
+    ButtonPage_Reset = wxID_HIGHEST,
     ButtonPage_ChangeLabel,
     ButtonPage_Button
 };
@@ -85,6 +85,9 @@ public:
     virtual wxControl *GetWidget() const { return m_button; }
     virtual void RecreateWidget() { CreateButton(); }
 
+    // lazy creation of the content
+    virtual void CreateContent();
+
 protected:
     // event handlers
     void OnCheckOrRadioBox(wxCommandEvent& event);
@@ -154,27 +157,18 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"),
 #if defined(__WXUNIVERSAL__)
-                       UNIVERSAL_CTRLS
-#elif defined(__WXMSW__)    || \
-      defined(__WXMOTIF__)  || \
-      defined(__WXGTK__)    || \
-      defined(__WXMAC__)    || \
-      defined(__WXPM__)     || \
-      defined(__WXPALMOS__)
-                       NATIVE_CTRLS
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
 #else
-                       GENERIC_CTRLS
+    #define FAMILY_CTRLS NATIVE_CTRLS
 #endif
-                       );
+
+IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), FAMILY_CTRLS );
 
 ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
                                      wxImageList *imaglist)
-                  : WidgetsPage(book)
+                  : WidgetsPage(book, imaglist, button_xpm)
 {
-    imaglist->Add(wxBitmap(button_xpm));
-
     // init everything
     m_chkBitmap =
     m_chkImage =
@@ -192,7 +186,10 @@ ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
 
     m_button = (wxButton *)NULL;
     m_sizerButton = (wxSizer *)NULL;
+}
 
+void ButtonWidgetsPage::CreateContent()
+{
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
@@ -278,8 +275,6 @@ ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
     CreateButton();
 
     SetSizer(sizerTop);
-
-    sizerTop->Fit(this);
 }
 
 // ----------------------------------------------------------------------------