X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/897b24cf5ca5ca41734c79f7092104921e0c8cae..fd587c7a5e2424a3a29012ac3efa6fff84dba035:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 204f38ba65..9552597133 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -27,7 +27,7 @@ class WXDLLEXPORT wxStdDialogButtonSizer; #define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX) #endif -extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { @@ -96,8 +96,10 @@ protected: #include "wx/msw/dialog.h" #elif defined(__WXMOTIF__) #include "wx/motif/dialog.h" - #elif defined(__WXGTK__) + #elif defined(__WXGTK20__) #include "wx/gtk/dialog.h" + #elif defined(__WXGTK__) + #include "wx/gtk1/dialog.h" #elif defined(__WXMAC__) #include "wx/mac/dialog.h" #elif defined(__WXCOCOA__)