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 4023441785eb725ffb7629ecad3c4db3a8dcc73e..914fa1a08b347d7eb210c85dcb5ed7d41d34b660 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -52,7 +52,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    ButtonPage_Reset = 100,
+    ButtonPage_Reset = wxID_HIGHEST,

     ButtonPage_ChangeLabel,
     ButtonPage_Button
 };
     ButtonPage_ChangeLabel,
     ButtonPage_Button
 };


@@ -79,10 +79,14 @@ enum
 class ButtonWidgetsPage : public WidgetsPage
 {
 public:
 class ButtonWidgetsPage : public WidgetsPage
 {
 public:

-    ButtonWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
+    ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

     virtual ~ButtonWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_button; }
     virtual ~ButtonWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_button; }

+    virtual void RecreateWidget() { CreateButton(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -153,14 +157,18 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), FAMILY_CTRLS );

 
 

-ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrlBase *book,
+ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,

                                      wxImageList *imaglist)
                                      wxImageList *imaglist)

-                  : WidgetsPage(book)
+                  : WidgetsPage(book, imaglist, button_xpm)

 {
 {

-    imaglist->Add(wxBitmap(button_xpm));
-

     // init everything
     m_chkBitmap =
     m_chkImage =
     // init everything
     m_chkBitmap =
     m_chkImage =


@@ -178,7 +186,10 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrlBase *book,
 
     m_button = (wxButton *)NULL;
     m_sizerButton = (wxSizer *)NULL;
 
     m_button = (wxButton *)NULL;
     m_sizerButton = (wxSizer *)NULL;

+}

 
 

+void ButtonWidgetsPage::CreateContent()
+{

     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane


@@ -264,8 +275,6 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrlBase *book,
     CreateButton();
 
     SetSizer(sizerTop);
     CreateButton();
 
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -311,7 +320,7 @@ void ButtonWidgetsPage::CreateButton()
         label = m_textLabel->GetValue();
     }
 
         label = m_textLabel->GetValue();
     }
 

-    int flags = 0;
+    int flags = ms_defaultFlags;

     switch ( m_radioHAlign->GetSelection() )
     {
         case ButtonHAlign_Left:
     switch ( m_radioHAlign->GetSelection() )
     {
         case ButtonHAlign_Left: