added wxSetInstance()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,6 +34,7 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
|
|||||||
WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
|
WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
|
||||||
|
|
||||||
WXDLLEXPORT HINSTANCE wxGetInstance();
|
WXDLLEXPORT HINSTANCE wxGetInstance();
|
||||||
|
WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
|
||||||
WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font);
|
WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font);
|
||||||
WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
|
WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
|
||||||
|
|
||||||
|
@@ -1126,6 +1126,11 @@ HINSTANCE wxGetInstance()
|
|||||||
return wxhInstance;
|
return wxhInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxSetInstance(HINSTANCE hInst)
|
||||||
|
{
|
||||||
|
wxhInstance = hInst;
|
||||||
|
}
|
||||||
|
|
||||||
// For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
|
// For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
|
||||||
// if in a separate file. So include it here to ensure it's linked.
|
// if in a separate file. So include it here to ensure it's linked.
|
||||||
#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
|
#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
|
||||||
|
Reference in New Issue
Block a user