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

Regenerated FL docs; applied patch [ #511363 ] Dialogs no longer need wx.rc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-01-31 20:57:31 +00:00
parent 807d848702
commit 6e8515a3e3
79 changed files with 314 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/makefile.vc
View File

@@ -752,6 +752,8 @@ allhlp: wxhlp
nmake -f makefile.vc hlp
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc hlp
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc hlp
cd $(THISDIR)
allhtml: wxhtml
@@ -759,6 +761,8 @@ allhtml: wxhtml
nmake -f makefile.vc html
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc html
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc html
cd $(THISDIR)
allhtmlhelp: htmlhelp
@@ -766,6 +770,8 @@ allhtmlhelp: htmlhelp
nmake -f makefile.vc htmlhelp
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htmlhelp
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc htmlhelp
cd $(THISDIR)
allhtb: htb
@@ -773,6 +779,8 @@ allhtb: htb
nmake -f makefile.vc htb
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htb
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc htb
cd $(THISDIR)
allps: wxps referencps
@@ -780,6 +788,8 @@ allps: wxps referencps
nmake -f makefile.vc ps
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc ps
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc ps
cd $(THISDIR)
allpdfrtf: pdfrtf
@@ -787,6 +797,8 @@ allpdfrtf: pdfrtf
nmake -f makefile.vc pdfrtf
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc pdfrtf
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc pdfrtf
cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj

35
src/msw/toplevel.cpp
View File

@@ -185,7 +185,7 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
return msflags;
}
bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
const wxString& title,
const wxPoint& pos,
const wxSize& size)
@@ -218,16 +218,16 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
}
}
m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(),
dlgTemplate,
m_hWnd = (WXHWND)::CreateDialogIndirect(wxGetInstance(),
(DLGTEMPLATE*)dlgTemplate,
parent ? GetHwndOf(parent) : NULL,
(DLGPROC)wxDlgProc);
if ( !m_hWnd )
{
wxFAIL_MSG(_("Did you forget to include wx/msw/wx.rc in your resources?"));
wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?"));
wxLogSysError(_("Can't create dialog using template '%s'"), dlgTemplate);
wxLogSysError(_("Can't create dialog using memory template"));
return FALSE;
}
@@ -358,15 +358,24 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// with & without captions under MSWindows, resizeable or not (but a
// resizeable dialog always has caption - otherwise it would look too
// strange)
const wxChar *dlgTemplate;
if ( style & wxRESIZE_BORDER )
dlgTemplate = wxT("wxResizeableDialog");
else if ( style & wxCAPTION )
dlgTemplate = wxT("wxCaptionDialog");
else
dlgTemplate = wxT("wxNoCaptionDialog");
int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3);
DLGTEMPLATE* dlgTemplate = (DLGTEMPLATE*)malloc( dlgsize );
memset (dlgTemplate, 0, dlgsize );
dlgTemplate->x = 34;
dlgTemplate->y = 22;
dlgTemplate->cx = 144;
dlgTemplate->cy = 75;
return CreateDialog(dlgTemplate, title, pos, size);
if ( style & wxRESIZE_BORDER )
dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME;
else if ( style & wxCAPTION )
dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU;
else
dlgTemplate->style = WS_POPUP;
bool ret = CreateDialog(dlgTemplate, title, pos, size);
free(dlgTemplate);
return ret;
}
else // !dialog
{