compilation fixes - wxGTK compiles but not links

[wxWidgets.git] / src / msw / filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index cc4ffb6e5ea32fac2c7aee586aeddebf098b3d15..29ba5231bd378215943ce1783e62dc08e7423762 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_FILEDLG
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"


@@ -193,7 +195,7 @@ wxString wxFileSelectorEx(const wxChar *title,
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,

-        long style, const wxPoint& pos)
+        long style, const wxPoint& WXUNUSED(pos))

 {
     m_message = message;
     m_dialogStyle = style;
 {
     m_message = message;
     m_dialogStyle = style;


@@ -246,8 +248,6 @@ int wxFileDialog::ShowModal()
         OFN_EXPLORER |
 #endif // OFN_EXPLORER
         OFN_ALLOWMULTISELECT;
         OFN_EXPLORER |
 #endif // OFN_EXPLORER
         OFN_ALLOWMULTISELECT;

-    if ( !(m_dialogStyle & wxCHANGE_DIR) )
-        msw_flags |= OFN_NOCHANGEDIR;

 
     OPENFILENAME of;
     wxZeroMemory(of);
 
     OPENFILENAME of;
     wxZeroMemory(of);


@@ -514,4 +514,5 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 

+#endif // wxUSE_FILEDLG