don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h
index 6e0e40f930a4efe60987898dc33cee3ac6594183..da413d2da76a3139fe1a37e35f94a292a9813a19 100644 (file)
--- a/include/wx/generic/numdlgg.h
+++ b/include/wx/generic/numdlgg.h
@@ -12,23 +12,23 @@
 #ifndef __NUMDLGH_G__
 #define __NUMDLGH_G__
 
 #ifndef __NUMDLGH_G__
 #define __NUMDLGH_G__
 

-#if wxUSE_NUMBERDLG
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

+#if wxUSE_NUMBERDLG
+

 #include "wx/dialog.h"
 
 #if wxUSE_SPINCTRL
 #include "wx/dialog.h"
 
 #if wxUSE_SPINCTRL

-    class WXDLLEXPORT wxSpinCtrl;
+    class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;

 #else
 #else

-    class WXDLLEXPORT wxTextCtrl;
+    class WXDLLIMPEXP_FWD_CORE wxTextCtrl;

 #endif // wxUSE_SPINCTRL
 
 // ----------------------------------------------------------------------------
 // wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 
 #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,
 {
 public:
     wxNumberEntryDialog(wxWindow *parent,


@@ -57,24 +57,23 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)

-    DECLARE_NO_COPY_CLASS(wxNumberEntryDialog)
+    wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog);

 };
 
 // ----------------------------------------------------------------------------
 // function to get a number from user
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // 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__
 
 #endif // wxUSE_NUMBERDLG
 
 #endif // __NUMDLGH_G__

-