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

Merge branch 'master' of https://github.com/wxWidgets/wxWidgets

Browse Source
This commit is contained in:
Stefan Csomor
2017-09-25 21:57:36 +02:00
parent 560676a393 81304fcafd
commit 032b718f88
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/main.cpp
View File

@@ -305,7 +305,13 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
return wxEntry(wxArgs.argc, wxArgs.argv); return wxEntry(wxArgs.argc, wxArgs.argv);
} }
#else // !wxUSE_GUI #endif // wxUSE_GUI
// ----------------------------------------------------------------------------
// global HINSTANCE
// ----------------------------------------------------------------------------
#if wxUSE_BASE
int wxEntry() int wxEntry()
{ {
@@ -314,14 +320,6 @@ int wxEntry()
return wxEntry(wxArgs.argc, wxArgs.argv); return wxEntry(wxArgs.argc, wxArgs.argv);
} }
#endif // wxUSE_GUI/!wxUSE_GUI
// ----------------------------------------------------------------------------
// global HINSTANCE
// ----------------------------------------------------------------------------
#if wxUSE_BASE
HINSTANCE wxhInstance = 0; HINSTANCE wxhInstance = 0;
extern "C" HINSTANCE wxGetInstance() extern "C" HINSTANCE wxGetInstance()