X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ecf902bc836f2808444b34eff48cdb12f289460..fd587c7a5e2424a3a29012ac3efa6fff84dba035:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 60c59e80ef..cf82cba2cc 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -16,10 +16,6 @@ #if wxUSE_FILEDLG -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "filedlg.h" -#endif - #include "wx/dialog.h" #include "wx/arrstr.h" @@ -40,8 +36,8 @@ enum wxCHANGE_DIR = 0x0040 }; -extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorPromptStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorDefaultWildcardStr; +extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; //---------------------------------------------------------------------------- // wxFileDialogBase @@ -113,7 +109,6 @@ public: protected: wxString m_message; long m_dialogStyle; - wxWindow *m_parent; wxString m_dir; wxString m_path; // Full path wxString m_fileName; @@ -173,8 +168,10 @@ wxSaveFileSelector(const wxChar *what, #include "wx/msw/filedlg.h" #elif defined(__WXMOTIF__) #include "wx/motif/filedlg.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/filedlg.h" +#elif defined(__WXGTK__) +#include "wx/gtk1/filedlg.h" #elif defined(__WXX11__) #include "wx/generic/filedlgg.h" #elif defined(__WXMGL__)