corrected release target which included some include files in the build

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

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 15fa044a8fe2cbd2f9d1c9eb5708b0fd5ad498c6..8a54f6f63d7450b1bdc29591b4c11c8faec38cb7 100644 (file)
--- 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,55 +23,52 @@ class MyWindow;
 
 class MyFrame: public wxFrame
 {
-  public:
-    wxPanel *panel;
-    MyTextWindow *text_window;
-    MyWindow *canvas;
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    void OnSize(wxSizeEvent& event);
-    void Draw(wxDC& dc, bool draw_bitmaps = TRUE);
+public:
+    MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h);
+
+    void OnQuit(wxCommandEvent& event);
 
-    void LoadFile(wxCommandEvent& event);
-    void Quit(wxCommandEvent& event);
     void TestSizers(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)
-  {
-  }
+    wxTextCtrl(frame, -1, _T(""), 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);
-    
+
+private:
     DECLARE_EVENT_TABLE()
 };
 
-class SizerFrame: public wxFrame
+class MySizerFrame: public wxFrame
 {
-  public:
+public:
     wxPanel *panel;
-    SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    void OnSize(wxSizeEvent& event);
-
-   DECLARE_EVENT_TABLE()
+    MySizerFrame(wxFrame *frame, wxChar *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_SIZER 104
+#define LAYOUT_TEST_NB    105