compilation fix for DLL build

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 3143996187cc267baeef47d05c677b2c567e7164..a45fcd828ddebab44ca98c8a36b2191e499d920c 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__


@@ -14,8 +14,9 @@
 
 // Define a new application type
 class MyApp: public wxApp
 
 // Define a new application type
 class MyApp: public wxApp

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

 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;
 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;


@@ -23,39 +24,41 @@ class MyApp: public wxApp
 
 // Define a new frame type
 class MyFrame: public wxFrame
 
 // Define a new frame type
 class MyFrame: public wxFrame

-{ public:
-    MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
-               const wxSize& size);
+{
+public:
+    MyFrame(wxWindow *parent, const wxString& title,
+            const wxPoint& pos, const wxSize& size);

 
     void ChooseColour(wxCommandEvent& event);
     void ChooseFont(wxCommandEvent& event);
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     void TextEntry(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 FileOpen(wxCommandEvent& event);

+    void FilesOpen(wxCommandEvent& event);

     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);

-    void ExtDialog(wxCommandEvent &event);

 
 #if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
     void ChooseColourGeneric(wxCommandEvent& event);
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif
 
 #if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
     void ChooseColourGeneric(wxCommandEvent& event);
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif

+

     void OnExit(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);

-       
+

   DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
   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,10 +71,11 @@ DECLARE_EVENT_TABLE()
 #define DIALOGS_SINGLE_CHOICE               6
 #define DIALOGS_TEXT_ENTRY                  7
 #define DIALOGS_FILE_OPEN                   8
 #define DIALOGS_SINGLE_CHOICE               6
 #define DIALOGS_TEXT_ENTRY                  7
 #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_FILES_OPEN                  9
+#define DIALOGS_FILE_SAVE                   10
+#define DIALOGS_DIR_CHOOSE                  11
+#define DIALOGS_TIP                         12
+#define DIALOGS_NUM_ENTRY                   13

 
 #endif
 
 
 #endif