made wxCommandEvent::GetInt() return int, not long (patch 1473771)

[wxWidgets.git] / include / wx / filedlg.h

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 60c59e80ef64fbe7a7a4496d26798e66896ed3c5..cf82cba2cc1761ff09ddad522eb18584b6268ebb 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -16,10 +16,6 @@
 
 #if wxUSE_FILEDLG
 
 
 #if wxUSE_FILEDLG
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "filedlg.h"
-#endif
-

 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 


@@ -40,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


@@ -113,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;


@@ -173,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(__WXGTK20__)

 #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__)