streamlining slider, scroller, spinbutton for osx carbon and cocoa

[wxWidgets.git] / include / wx / generic / numdlgg.h

diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h
index a5f24a9780706926b9f889969e6deee9c5ce1ff4..0ce35fb8087d9c66049ad9f2500b8f210a2c518f 100644 (file)
--- a/include/wx/generic/numdlgg.h
+++ b/include/wx/generic/numdlgg.h
@@ -5,34 +5,30 @@
 // Modified by:
 // Created:     07.02.04 (extracted from textdlgg.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __NUMDLGH_G__
 #define __NUMDLGH_G__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "numdlgg.h"
-#endif
+#include "wx/defs.h"
 
 #if wxUSE_NUMBERDLG
 
-#include "wx/defs.h"
-
 #include "wx/dialog.h"
 
 #if wxUSE_SPINCTRL
-    class WXDLLEXPORT wxSpinCtrl;
+    class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
 #else
-    class WXDLLEXPORT wxTextCtrl;
+    class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 #endif // wxUSE_SPINCTRL
 
 // ----------------------------------------------------------------------------
 // wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNumberEntryDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog
 {
 public:
     wxNumberEntryDialog(wxWindow *parent,
@@ -60,6 +56,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)
     DECLARE_NO_COPY_CLASS(wxNumberEntryDialog)
 };
 
@@ -67,17 +64,16 @@ private:
 // function to get a number from user
 // ----------------------------------------------------------------------------
 
-long WXDLLEXPORT
-wxGetNumberFromUser(const wxString& message,
-                    const wxString& prompt,
-                    const wxString& caption,
-                    long value = 0,
-                    long min = 0,
-                    long max = 100,
-                    wxWindow *parent = (wxWindow *)NULL,
-                    const wxPoint& pos = wxDefaultPosition);
+WXDLLIMPEXP_CORE long
+    wxGetNumberFromUser(const wxString& message,
+                        const wxString& prompt,
+                        const wxString& caption,
+                        long value = 0,
+                        long min = 0,
+                        long max = 100,
+                        wxWindow *parent = NULL,
+                        const wxPoint& pos = wxDefaultPosition);
 
 #endif // wxUSE_NUMBERDLG
 
 #endif // __NUMDLGH_G__
-