Fixed wxFileDialog and VC++ DLL compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user