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

16
include/wx/msw/private.h
View File

@@ -62,6 +62,13 @@ extern WXDLLIMPEXP_DATA_CORE(HFONT) wxSTATUS_LINE_FONT;
extern WXDLLIMPEXP_DATA_BASE(HINSTANCE) wxhInstance;
extern "C"
{
WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
}
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
// ---------------------------------------------------------------------------
// define things missing from some compilers' headers
// ---------------------------------------------------------------------------
@@ -769,7 +776,7 @@ public:
{
if ( IsRegistered() )
{
if ( !::UnregisterClass(m_clsname.wx_str(), wxhInstance) )
if ( !::UnregisterClass(m_clsname.wx_str(), wxGetInstance()) )
{
wxLogLastError(wxT("UnregisterClass"));
}
@@ -839,13 +846,6 @@ private:
// global functions
// ---------------------------------------------------------------------------
extern "C"
{
WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
}
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
// return the full path of the given module
inline wxString wxGetFullModuleName(HMODULE hmod)
{

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));

2
src/msw/msgdlg.cpp
View File

@@ -267,7 +267,7 @@ void wxMessageDialog::ReplaceStaticWithEdit()
rc.right - rc.left, rc.bottom - rc.top,
GetHwnd(),
NULL,
wxhInstance,
wxGetInstance(),
NULL
);