X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96d3780753c7f6acfa4e29c1365f8abbfaba8f8c..045c4fab85bd7bcc59010d663e23ea70dda3c7bc:/samples/notebook/test.h diff --git a/samples/notebook/test.h b/samples/notebook/test.h index 70b52a00e4..9cbcc2d0ff 100644 --- a/samples/notebook/test.h +++ b/samples/notebook/test.h @@ -6,7 +6,7 @@ // Created: 25/10/98 // RCS-ID: $Id$ // Copyright: (c) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include @@ -16,7 +16,7 @@ class MyApp: public wxApp { public: bool OnInit(void); - void InitTabView(wxNotebook* notebook, wxWindow* window); + void InitTabView(wxNotebook* notebook, wxPanel* window); wxButton* m_okButton; wxButton* m_cancelButton; @@ -25,6 +25,8 @@ public: DECLARE_APP(MyApp) +#if USE_TABBED_DIALOG + class MyDialog: public wxDialog { public: @@ -38,9 +40,11 @@ public: protected: wxNotebook* m_notebook; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; +#else // USE_TABBED_DIALOG + class MyFrame: public wxFrame { public: @@ -51,7 +55,6 @@ public: void OnCloseWindow(wxCloseEvent& event); void OnAddPage(wxCommandEvent& event); void OnDeletePage(wxCommandEvent& event); - void OnSize(wxSizeEvent& event); void OnIdle(wxIdleEvent& event); void Init(); @@ -60,9 +63,11 @@ protected: wxNotebook* m_notebook; wxPanel* m_panel; // Panel containing notebook and OK/Cancel/Help -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; +#endif // USE_TABBED_DIALOG + // File ids #define TEST_ABOUT 2