projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On WinCE, generic font dialog didn't work because the point size wxChoice
[wxWidgets.git]
/
include
/
wx
/
filedlg.h
diff --git
a/include/wx/filedlg.h
b/include/wx/filedlg.h
index bbe1ebaca5b12a98e11d81fbfac04fd1afa3786e..cf82cba2cc1761ff09ddad522eb18584b6268ebb 100644
(file)
--- a/
include/wx/filedlg.h
+++ b/
include/wx/filedlg.h
@@
-36,8
+36,8
@@
enum
wxCHANGE_DIR = 0x0040
};
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
//----------------------------------------------------------------------------
// wxFileDialogBase
@@
-109,7
+109,6
@@
public:
protected:
wxString m_message;
long m_dialogStyle;
protected:
wxString m_message;
long m_dialogStyle;
- wxWindow *m_parent;
wxString m_dir;
wxString m_path; // Full path
wxString m_fileName;
wxString m_dir;
wxString m_path; // Full path
wxString m_fileName;
@@
-169,8
+168,10
@@
wxSaveFileSelector(const wxChar *what,
#include "wx/msw/filedlg.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/filedlg.h"
#include "wx/msw/filedlg.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/filedlg.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/filedlg.h"
#include "wx/gtk/filedlg.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/filedlg.h"
#elif defined(__WXX11__)
#include "wx/generic/filedlgg.h"
#elif defined(__WXMGL__)
#elif defined(__WXX11__)
#include "wx/generic/filedlgg.h"
#elif defined(__WXMGL__)