no_rtti fix was not having correct eval order

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

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 8680c07da7cd06254eae08df10bb1c32f8b3dcd5..63cfb0d58367634938c31d675d7f43707b5c6e61 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -139,8 +139,10 @@ END_EVENT_TABLE()
 class StaticWidgetsPage : public WidgetsPage
 {
 public:
 class StaticWidgetsPage : public WidgetsPage
 {
 public:

-    StaticWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~StaticWidgetsPage();
+    StaticWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    virtual ~StaticWidgetsPage(){};
+
+    virtual wxControl *GetWidget() const { return m_statText; }

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


@@ -203,9 +205,9 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"));
 
 
 IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"));
 

-StaticWidgetsPage::StaticWidgetsPage(wxNotebook *notebook,
-                                       wxImageList *imaglist)
-                  : WidgetsPage(notebook)
+StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book,
+                                     wxImageList *imaglist)
+                  : WidgetsPage(book)

 {
     imaglist->Add(wxBitmap(statbox_xpm));
 
 {
     imaglist->Add(wxBitmap(statbox_xpm));
 


@@ -302,10 +304,6 @@ StaticWidgetsPage::StaticWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
     sizerTop->Fit(this);
 }
 

-StaticWidgetsPage::~StaticWidgetsPage()
-{
-}
-

 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------