X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc0d5b6bd2f479983377bbc0068cb061c6ccce98..27d2dbbccadf25bb1d892fe1c4afbf74cf76bb36:/include/wx/generic/textdlgg.h diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index f68bd873af..b255dd89a4 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -1,21 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// // Name: textdlgg.h -// Purpose: wxStatusBar class +// Purpose: wxTextEntryDialog class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __TEXTDLGH_G__ #define __TEXTDLGH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "textdlgg.h" #endif +#if wxUSE_TEXTDLG #include "wx/defs.h" #include "wx/dialog.h" @@ -27,7 +28,6 @@ class WXDLLEXPORT wxTextCtrl; WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) @@ -66,6 +66,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextEntryDialog) + DECLARE_NO_COPY_CLASS(wxTextEntryDialog) }; // ---------------------------------------------------------------------------- @@ -77,9 +78,9 @@ wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr, const wxString& default_value = wxEmptyString, wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE); + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true); wxString WXDLLEXPORT wxGetPasswordFromUser(const wxString& message, @@ -87,5 +88,7 @@ wxGetPasswordFromUser(const wxString& message, const wxString& default_value = wxEmptyString, wxWindow *parent = (wxWindow *) NULL); +#endif + // wxUSE_TEXTDLG #endif // __TEXTDLGH_G__