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

Use wxGetInstance() instead of wxhInstance in wxMSW code.

Browse Source 
No real changes, just use an accessor function instead of directly accessing
the global variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-02-25 00:03:59 +00:00
parent 2856f57b37
commit 5431e4a684
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/app.cpp
View File

@@ -659,7 +659,7 @@ const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
wxZeroMemory(wndclass);
wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
wndclass.hInstance = wxhInstance;
wndclass.hInstance = wxGetInstance();
wndclass.hCursor = ::LoadCursor(NULL, IDC_ARROW);
wndclass.hbrBackground = (HBRUSH)wxUIntToPtr(bgBrushCol + 1);
wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | extraStyles;
@@ -693,7 +693,7 @@ const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
{
wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
regClass.regname));
::UnregisterClass(regClass.regname.c_str(), wxhInstance);
::UnregisterClass(regClass.regname.c_str(), wxGetInstance());
return NULL;
}
@@ -725,13 +725,13 @@ void wxApp::UnregisterWindowClasses()
for ( size_t n = 0; n < count; n++ )
{
const ClassRegInfo& regClass = gs_regClassesInfo[n];
if ( !::UnregisterClass(regClass.regname.c_str(), wxhInstance) )
if ( !::UnregisterClass(regClass.regname.c_str(), wxGetInstance()) )
{
wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"),
regClass.regname));
}
if ( !::UnregisterClass(regClass.regnameNR.c_str(), wxhInstance) )
if ( !::UnregisterClass(regClass.regnameNR.c_str(), wxGetInstance()) )
{
wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"),
regClass.regnameNR));