Avoid double free in wxComboBox::SetClientObject.

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index f68bd873af5d08069d21889d177e6be457275e6f..d9cbafc1b726a4a25a8b9d7bdc98d0772346a250 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -5,17 +5,18 @@
 // 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)
 };
 
 // ----------------------------------------------------------------------------
@@ -87,5 +88,7 @@ wxGetPasswordFromUser(const wxString& message,
                       const wxString& default_value = wxEmptyString,
                       wxWindow *parent = (wxWindow *) NULL);
 
+#endif
+    // wxUSE_TEXTDLG
 #endif
     // __TEXTDLGH_G__