X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..a3c1786def55bcc233f9606acb1aceee956d184f:/samples/dialogs/dialogs.h?ds=sidebyside

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index aa5e5543ea..b0f79f0116 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
@@ -14,8 +14,9 @@
 
 // Define a new application type
 class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
+{
+public:
+    bool OnInit();
 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;
@@ -23,37 +24,41 @@ class MyApp: public wxApp
 
 // Define a new frame type
 class MyFrame: public wxFrame
-{ public:
-    MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
-		const wxSize& size);
-    bool OnClose(void) { return TRUE; }
+{
+public:
+    MyFrame(wxWindow *parent, const wxString& title,
+            const wxPoint& pos, const wxSize& size);
 
-	void ChooseColour(wxCommandEvent& event);
-	void ChooseFont(wxCommandEvent& event);
+    void ChooseColour(wxCommandEvent& event);
+    void ChooseFont(wxCommandEvent& event);
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);
+    void NumericEntry(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
+    void ShowTip(wxCommandEvent& event);
+    void ExtDialog(wxCommandEvent &event);
 
-#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
-	void ChooseColourGeneric(wxCommandEvent& event);
-	void ChooseFontGeneric(wxCommandEvent& event);
+#if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
+    void ChooseColourGeneric(wxCommandEvent& event);
+    void ChooseFontGeneric(wxCommandEvent& event);
 #endif
-	void OnExit(wxCommandEvent& event);
-DECLARE_EVENT_TABLE()
+
+    void OnExit(wxCommandEvent& event);
+
+  DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
- public:
-  MyCanvas(wxWindow *parent):
-      wxScrolledWindow(parent)
-    {
-    }
-  void OnPaint(wxPaintEvent& event);
-DECLARE_EVENT_TABLE()
+public:
+    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent) { }
+
+    void OnPaint(wxPaintEvent& event);
+
+    DECLARE_EVENT_TABLE()
 };
 
 
@@ -68,6 +73,9 @@ DECLARE_EVENT_TABLE()
 #define DIALOGS_FILE_OPEN                   8
 #define DIALOGS_FILE_SAVE                   9
 #define DIALOGS_DIR_CHOOSE                  10
+#define DIALOGS_TIP                         11
+#define DIALOGS_EXT_DIALOG                  12
+#define DIALOGS_NUM_ENTRY                   13
 
 #endif