Catching up to new common class interfaces.

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

diff --git a/samples/resource/resource.h b/samples/resource/resource.h
index 39c46068c9a6d8d155d171abacbd4439c4f291f2..5ffccc779d6ed2f3a35af0f299562b26d655fe5f 100644 (file)
--- a/samples/resource/resource.h
+++ b/samples/resource/resource.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -16,44 +16,54 @@
 // Define a new application
 class MyApp: public wxApp
 {
-  public:
-    MyApp(void) ;
-    bool OnInit(void);
+public:
+    MyApp();
+
+    virtual bool OnInit();
+
+    virtual ~MyApp();
 };
 
 class MyPanel: public wxPanel
 {
-  public:
-    MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-             int style, const wxString &name );
+public:
+    MyPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+            const wxSize& size, int style, const wxString &name);
     void OnClick(wxMouseEvent &event);
-
- DECLARE_EVENT_TABLE()
+    
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 class MyFrame: public wxFrame
 {
-  public:
-    wxWindow *panel;
-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size);
-    bool OnClose(void);
+public:
+    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
+            const wxPoint& pos, const wxSize& size);
     void OnQuit(wxCommandEvent& event);
-    void OnTest1(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnTestDialog(wxCommandEvent& event);
+    
+    wxWindow *panel;
 
- DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 class MyDialog : public wxDialog
 {
-  public:
+public:
     void OnOk(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
-
- DECLARE_EVENT_TABLE()
+    
+private:
+    DECLARE_EVENT_TABLE()
 };
 
-#define RESOURCE_QUIT       4
-#define RESOURCE_TEST1      2
-
-#define RESOURCE_OK         1
-#define RESOURCE_CANCEL     2
+// the values should be the same as in menu.wxr file!
+enum
+{
+    RESOURCE_TESTDIALOG = 2,
+    RESOURCE_QUIT = 4,
+    RESOURCE_ABOUT = 6
+};