AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/msw/generic.rsp
View File

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

3
distrib/msw/zipdist.bat
View File

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

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

13
utils/dialoged/src/makefile.vc
View File

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

4
utils/dialoged/src/reseditr.cpp
View File

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