X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c62ac5b6e49ed327d4cc2c815e2e5a05f7f5ec3c..4b04699b670b4ab4632229fa0264d154acd3bec1:/samples/layout/layout.h?ds=inline diff --git a/samples/layout/layout.h b/samples/layout/layout.h index 14bbd7a502..eba0332e16 100644 --- a/samples/layout/layout.h +++ b/samples/layout/layout.h @@ -6,15 +6,15 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// // Define a new application class MyApp: public wxApp { - public: - MyApp(void) ; - bool OnInit(void); +public: + MyApp(); + bool OnInit(); }; // Define a new frame @@ -23,7 +23,7 @@ class MyWindow; class MyFrame: public wxFrame { - public: +public: wxPanel *panel; MyTextWindow *text_window; MyWindow *canvas; @@ -34,57 +34,47 @@ class MyFrame: public wxFrame void LoadFile(wxCommandEvent& event); void Quit(wxCommandEvent& event); void TestSizers(wxCommandEvent& event); - void TestNewSizers(wxCommandEvent& event); + void TestNotebookSizers(wxCommandEvent& event); void About(wxCommandEvent& event); - DECLARE_EVENT_TABLE() +private: + DECLARE_EVENT_TABLE() }; // Define a new text subwindow that can respond to drag-and-drop class MyTextWindow: public wxTextCtrl { - public: - MyTextWindow(wxFrame *frame, int x=-1, int y=-1, int width=-1, int height=-1, +public: + MyTextWindow(wxFrame *frame, int x=-1, int y=-1, int width=-1, int height=-1, long style=wxTE_MULTILINE): wxTextCtrl(frame, -1, "", wxPoint(x, y), wxSize(width, height), style) - { - } + { + } + }; // Define a new canvas which can receive some events class MyWindow: public wxWindow { - public: +public: MyWindow(wxFrame *frame, int x, int y, int w, int h, long style = wxRETAINED); - ~MyWindow(void) ; + ~MyWindow(); void OnPaint(wxPaintEvent& event); - - DECLARE_EVENT_TABLE() -}; -class SizerFrame: public wxFrame -{ - public: - wxPanel *panel; - SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h); - void OnSize(wxSizeEvent& event); - - DECLARE_EVENT_TABLE() +private: + DECLARE_EVENT_TABLE() }; -class NewSizerFrame: public wxFrame +class MySizerFrame: public wxFrame { - public: +public: wxPanel *panel; - wxNewSizer *topsizer; - NewSizerFrame(wxFrame *frame, char *title, int x, int y ); - void OnSize(wxSizeEvent& event); - - DECLARE_EVENT_TABLE() + MySizerFrame(wxFrame *frame, char *title, int x, int y ); }; #define LAYOUT_QUIT 100 #define LAYOUT_TEST 101 #define LAYOUT_ABOUT 102 #define LAYOUT_LOAD_FILE 103 -#define LAYOUT_TEST_NEW 104 +#define LAYOUT_TEST_SIZER 104 +#define LAYOUT_TEST_NB 105