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

The reinit of the stock objects shoudl not happen when wxPython is

Browse Source 
embedded in a C++ wx application


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-01 19:23:12 +00:00
parent 2620b36e03
commit 70e45c91bb
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/src/helpers.cpp
View File

@@ -723,6 +723,16 @@ void wxPy_ReinitStockObjects(int pass)
else if (pass == 2) { rsoPass2(#name); } \ else if (pass == 2) { rsoPass2(#name); } \
else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); } else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); }
// If there is already an App object then wxPython is probably embedded in
// a wx C++ application, so there is no need to do all this.
static bool embedded = false;
if ((pass == 1 || pass == 2) && wxTheApp) {
embedded = true;
return;
}
if (pass == 3 && embedded)
return;
REINITOBJ(wxNORMAL_FONT, wxFont); REINITOBJ(wxNORMAL_FONT, wxFont);
REINITOBJ(wxSMALL_FONT, wxFont); REINITOBJ(wxSMALL_FONT, wxFont);