wxGLCanvas works again

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 0cf94426a375fac2351a4785c8f497fbad85e5af..e93dd84f5bc6c133376a166d544ffb09c2ab2554 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -20,8 +20,8 @@
 #include "wx/dialog.h"
 
 // Handy dialog functions (will be converted into classes at some point)
 #include "wx/dialog.h"
 
 // Handy dialog functions (will be converted into classes at some point)

-WXDLLEXPORT_DATA(extern const char*) wxGetTextFromUserPromptStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 #define wxID_TEXT 3000
 
 
 #define wxID_TEXT 3000
 


@@ -44,7 +44,7 @@ DECLARE_EVENT_TABLE()
 };
 
 wxString WXDLLEXPORT wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr,
 };
 
 wxString WXDLLEXPORT wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr,

-                        const wxString& default_value = wxEmptyString, wxWindow *parent = NULL,
+                        const wxString& default_value = wxEmptyString, wxWindow *parent = (wxWindow *) NULL,

                         int x = -1, int y = -1, bool centre = TRUE);
 
 #endif
                         int x = -1, int y = -1, bool centre = TRUE);
 
 #endif