a fix for the last fix

[wxWidgets.git] / samples / layout / layout.h

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 7aad45fd8244a232e5dd5c06a8c230d203f78014..dae135e135bfe7edcd1173d19a7cba3f76a43014 100644 (file)
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -12,9 +12,9 @@
 // Define a new application
 class MyApp: public wxApp
 {
 // Define a new application
 class MyApp: public wxApp
 {

-  public:
-    MyApp(void) ;
-    bool OnInit(void);
+public:
+    MyApp();
+    bool OnInit();

 };
 
 // Define a new frame
 };
 
 // Define a new frame


@@ -23,7 +23,7 @@ class MyWindow;
 
 class MyFrame: public wxFrame
 {
 
 class MyFrame: public wxFrame
 {

-  public:
+public:

     wxPanel *panel;
     MyTextWindow *text_window;
     MyWindow *canvas;
     wxPanel *panel;
     MyTextWindow *text_window;
     MyWindow *canvas;


@@ -33,44 +33,48 @@ class MyFrame: public wxFrame
 
     void LoadFile(wxCommandEvent& event);
     void Quit(wxCommandEvent& event);
 
     void LoadFile(wxCommandEvent& event);
     void Quit(wxCommandEvent& event);

-    void TestNewSizers(wxCommandEvent& event);
+    void TestSizers(wxCommandEvent& event);
+    void TestNotebookSizers(wxCommandEvent& event);

     void About(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
 {
 };
 
 // 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)
                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
 {
 };
 
 // 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(wxFrame *frame, int x, int y, int w, int h, long style = wxRETAINED);

-    ~MyWindow(void) ;
+    ~MyWindow();

     void OnPaint(wxPaintEvent& event);
     void OnPaint(wxPaintEvent& event);

-    
+
+private:    

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class NewSizerFrame: public wxFrame
+class MySizerFrame: public wxFrame

 {
 {

-  public:
+public:

     wxPanel *panel;
     wxPanel *panel;

-    NewSizerFrame(wxFrame *frame, char *title, int x, int y );
-    
+    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_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