Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wxFileDialog and VC++ DLL compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-25 14:45:13 +00:00
parent 90b1b133da
commit 574c0bbfbd
7 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/filedlg.cpp
View File

@@ -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';
}
}

12
src/msw/iniconf.cpp
View File

@@ -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;
}

2
src/msw/makefile.vc
View File

@@ -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
<<
########################################################