Fixed wxFileDialog and VC++ DLL compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 24962ffcf0278ede3bc21bf4239afd0542e84edb..aab6594db7952fb4b60c83f2572e408eeeb900a2 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -98,16 +98,6 @@ utils/wxhelp/src/*.ico
 utils/wxhelp/src/*.def
 utils/wxhelp/src/*.rc
 
-utils/wxtree/src/*.cpp
-utils/wxtree/src/*.h
-utils/wxtree/src/makefile*
-utils/wxtree/src/*.xbm
-utils/wxtree/src/*.xpm
-utils/wxtree/lib/dummy
-utils/wxtree/src/*.ico
-utils/wxtree/src/*.def
-utils/wxtree/src/*.rc
-
 utils/wxgraph/src/*.cpp
 utils/wxgraph/src/*.c
 utils/wxgraph/src/*.h

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 84d9560d98529da88ab97dcb8d36eb44ad5a68fe..a1b91fc8a61b9a441f15ef9d9ab2d9969cdb175f 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -46,6 +46,9 @@ zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
 rem Tex2RTF
 zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
 
+rem wxTreeLayout
+zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.rsp
+
 copy %src\docs\changes.txt %dest
 copy %src\docs\msw\install.txt %dest\install_msw.txt
 copy %src\docs\motif\install.txt %dest\install_motif.txt

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index b302e60220cd1a9153b6f301bbccdf1c035aef9d..c596792816ed60ad00fe6bd014b794a442d09df9 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -106,8 +106,8 @@ wxString wxFileSelector(const char *title,
 
                 if( i-is-1 > 0 && is+1 < filter2.Len() )
                 {
-//                    if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
-                    if( filter2.Mid(is+1,i-is-1) == defaultExtension )
+                    if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
+//                    if( filter2.Mid(is+1,i-is-1) == defaultExtension )
                     {
                         filterFind = filterIndex;
                         break;
@@ -251,10 +251,13 @@ int wxFileDialog::ShowModal(void)
     else {                                // more then one filter
         filterBuffer = theFilter;
 
-        for ( unsigned int i = 0; i < filterBuffer.Len(); i++ ) {
-            if ( filterBuffer.GetChar(i) == '|' ) {
-                filterBuffer[i] = '\0';
-            }
+    }
+
+    filterBuffer += "|";
+    // Replace | with \0
+    for ( unsigned int i = 0; i < filterBuffer.Len(); i++ ) {
+        if ( filterBuffer.GetChar(i) == '|' ) {
+            filterBuffer[i] = '\0';
         }
     }
 

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index cc607851816f813f60235b70e1142fbd764c9405..c249619a243bf39f6beaa480d89e3173de7545d2 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -467,3 +467,15 @@ bool wxIniConfig::DeleteAll()
 
   return TRUE;
 }
+
+bool wxIniConfig::RenameEntry(const wxString& oldName, const wxString& newName)
+{
+    // Not implemented
+    return FALSE;
+}
+
+bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+{
+    // Not implemented
+    return FALSE;
+}

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 09b9999643a9651677aa5ea72c7b446e8d7a78dc..b197ff7de3bbd152324f98b97a38f111eb1e7551 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -288,7 +288,7 @@ $(WXDIR)\lib\wx200.dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx200.lib
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\wx200.dll
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
 <<
 
 ########################################################

diff --git a/utils/dialoged/src/makefile.vc b/utils/dialoged/src/makefile.vc
index 2cd2b30b2f1cbe7b92dd4d46c7294968155dc8f2..79339bd8b64e8aa7d8c5c19c2dcd9df07e0684c7 100644 (file)
--- a/utils/dialoged/src/makefile.vc
+++ b/utils/dialoged/src/makefile.vc
@@ -72,19 +72,6 @@ winstyle.obj:      winstyle.h winstyle.$(SRCSUFF) $(DUMMYOBJ)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
-
-clean:
-        -erase *.obj
-        -erase *.sbr
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.pdb
-
-cleanutils: clean
-
 DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
  $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
  $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\tech.tex

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 27a2d41cfcbe21e64d63d8f23f03c39556aa5373..61dbed5776c3f85eba07fd920c45027e9fa67d69 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -394,7 +394,7 @@ bool wxResourceManager::Save(const wxString& filename)
 bool wxResourceManager::SaveAs()
 {
   wxString s(wxFileSelector("Save resource file", wxPathOnly(WXSTRINGCAST m_currentFilename), wxFileNameFromPath(WXSTRINGCAST m_currentFilename),
-    "wxr", "*.wxr", wxSAVE | wxOVERWRITE_PROMPT));
+    "wxr", "*.wxr", wxSAVE | wxOVERWRITE_PROMPT, wxTheApp->GetTopWindow()));
     
   if (s.IsNull() || s == "")
     return FALSE;
@@ -437,7 +437,7 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
     wxString str = filename;
     if (str == wxString(""))
     {
-      wxString f(wxFileSelector("Open resource file", NULL, NULL, "wxr", "*.wxr", 0, NULL));
+      wxString f(wxFileSelector("Open resource file", NULL, NULL, "wxr", "*.wxr", 0, wxTheApp->GetTopWindow()));
       if (!f.IsNull() && f != "")
         str = f;
       else