don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index a0f8fbcf3b92c025b97abf133e289b8a397d634f..fab6bfeaf442e3a9276d8050c9847e8c11a0a33d 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -25,8 +25,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 

-extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[];

 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 
 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 


@@ -34,7 +34,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextEntryDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog

 {
 public:
     wxTextEntryDialog(wxWindow *parent,
 {
 public:
     wxTextEntryDialog(wxWindow *parent,


@@ -49,7 +49,10 @@ public:
 
 #if wxUSE_VALIDATORS
     void SetTextValidator( const wxTextValidator& validator );
 
 #if wxUSE_VALIDATORS
     void SetTextValidator( const wxTextValidator& validator );

-    void SetTextValidator( long style = wxFILTER_NONE );
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( void SetTextValidator( long style ) );
+#endif
+    void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE );

     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif
   // wxUSE_VALIDATORS
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif
   // wxUSE_VALIDATORS


@@ -65,14 +68,14 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)

-    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)
+    wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog);

 };
 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog
+class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog

 {
 public:
     wxPasswordEntryDialog(wxWindow *parent,
 {
 public:
     wxPasswordEntryDialog(wxWindow *parent,


@@ -83,30 +86,30 @@ public:
                       const wxPoint& pos = wxDefaultPosition);
 private:
     DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog)
                       const wxPoint& pos = wxDefaultPosition);
 private:
     DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog)

-    DECLARE_NO_COPY_CLASS(wxPasswordEntryDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog);

 };
 
 // ----------------------------------------------------------------------------
 // function to get a string from user
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // function to get a string from user
 // ----------------------------------------------------------------------------
 

-wxString WXDLLEXPORT
-wxGetTextFromUser(const wxString& message,
-                  const wxString& caption = wxGetTextFromUserPromptStr,
-                  const wxString& default_value = wxEmptyString,
-                  wxWindow *parent = (wxWindow *) NULL,
-                  wxCoord x = wxDefaultCoord,
-                  wxCoord y = wxDefaultCoord,
-                  bool centre = true);
-
-wxString WXDLLEXPORT
-wxGetPasswordFromUser(const wxString& message,
-                      const wxString& caption = wxGetPasswordFromUserPromptStr,
-                      const wxString& default_value = wxEmptyString,
-                      wxWindow *parent = (wxWindow *) NULL,
-                      wxCoord x = wxDefaultCoord,
-                      wxCoord y = wxDefaultCoord,
-                      bool centre = true);
+WXDLLIMPEXP_CORE wxString
+    wxGetTextFromUser(const wxString& message,
+                    const wxString& caption = wxGetTextFromUserPromptStr,
+                    const wxString& default_value = wxEmptyString,
+                    wxWindow *parent = NULL,
+                    wxCoord x = wxDefaultCoord,
+                    wxCoord y = wxDefaultCoord,
+                    bool centre = true);
+
+WXDLLIMPEXP_CORE wxString
+    wxGetPasswordFromUser(const wxString& message,
+                        const wxString& caption = wxGetPasswordFromUserPromptStr,
+                        const wxString& default_value = wxEmptyString,
+                        wxWindow *parent = NULL,
+                        wxCoord x = wxDefaultCoord,
+                        wxCoord y = wxDefaultCoord,
+                        bool centre = true);

 
 #endif
     // wxUSE_TEXTDLG
 
 #endif
     // wxUSE_TEXTDLG