avoid a bug in Carbon headers

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index a5d0000d47ca992b85aa5e6caba1b11297731266..d9cbafc1b726a4a25a8b9d7bdc98d0772346a250 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "textdlgg.h"
 #endif
 
     #pragma interface "textdlgg.h"
 #endif
 


@@ -28,7 +28,6 @@
 class WXDLLEXPORT wxTextCtrl;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
 class WXDLLEXPORT wxTextCtrl;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

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