Fix to MDI to restore 3D border; kludge to OGL Studio sample to redraw

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 7ec54aecf3d688a49203b728c00cf01a4dcace54..b3f2a2999bae66f636bf8030b1e4028ca9244eb9 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#include "wx/msw/private.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -28,7 +29,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
 
     #include "wx/intl.h"
     #include "wx/log.h"
 

-    #include "wx/msw/private.h"
+//    #include "wx/msw/private.h"

 #endif
 
 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
 #endif
 
 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)


@@ -183,7 +184,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;

-    m_filterIndex = 1;
+    m_filterIndex = 0;

 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const


@@ -293,7 +294,7 @@ int wxFileDialog::ShowModal()
     }
 
     of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;
     }
 
     of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;

-    of.nFilterIndex = m_filterIndex;
+    of.nFilterIndex = m_filterIndex + 1;

 
     //=== Setting defaultFileName >>=========================================
 
 
     //=== Setting defaultFileName >>=========================================
 


@@ -354,9 +355,9 @@ int wxFileDialog::ShowModal()
 
             //=== Adding the correct extension >>=================================
 
 
             //=== Adding the correct extension >>=================================
 

-            m_filterIndex = (int)of.nFilterIndex;
+            m_filterIndex = (int)of.nFilterIndex - 1;

 
 

-            if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.') )
+            if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.')) )

             {                                    // user has typed an filename
                 // without an extension:
 
             {                                    // user has typed an filename
                 // without an extension: