Added support for the wxFRAME_FLOAT_ON_PARENT style

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

diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h
index ed5fa54197de3782653062af6b3a0c8a5788e410..c67bb0c1a68434a0067aff119e7807cb91a58a2a 100644 (file)
--- a/samples/sashtest/sashtest.h
+++ b/samples/sashtest/sashtest.h
@@ -6,10 +6,10 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include <wx/toolbar.h>
+#include "wx/toolbar.h"

 
 // Define a new application
 class MyApp: public wxApp
 
 // Define a new application
 class MyApp: public wxApp


@@ -35,7 +35,6 @@ class MyFrame: public wxMDIParentFrame
 
     MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
 
 
     MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
 

-    bool OnClose(void);

     void OnSize(wxSizeEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnNewWindow(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnNewWindow(wxCommandEvent& event);


@@ -58,18 +57,17 @@ class MyChild: public wxMDIChildFrame
     MyCanvas *canvas;
     MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~MyChild(void);
     MyCanvas *canvas;
     MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~MyChild(void);

-    bool OnClose(void);

     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 
 DECLARE_EVENT_TABLE()
 };
 
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 
 DECLARE_EVENT_TABLE()
 };
 

-#define SASHTEST_QUIT        1
+#define SASHTEST_QUIT        wxID_EXIT

 #define SASHTEST_NEW_WINDOW  2
 #define SASHTEST_REFRESH     3
 #define SASHTEST_CHILD_QUIT  4
 #define SASHTEST_NEW_WINDOW  2
 #define SASHTEST_REFRESH     3
 #define SASHTEST_CHILD_QUIT  4

-#define SASHTEST_ABOUT       5
+#define SASHTEST_ABOUT       wxID_ABOUT

 #define SASHTEST_TOGGLE_WINDOW 6
 
 #define ID_WINDOW_TOP       100
 #define SASHTEST_TOGGLE_WINDOW 6
 
 #define ID_WINDOW_TOP       100