AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added missing call to wxInitializeStockLists() in CommonInit.

Browse Source 
Come on people!  Before checking in changes that affect more than one
platform, please test more than one platform!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1998-08-07 18:28:52 +00:00
parent 35eca07ccd
commit d50b2a58e9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/msw/app.cpp
View File

@ -263,9 +263,9 @@ bool wxApp::RegisterWindowClasses()
memset(&wndclass3, 0, sizeof(WNDCLASS)); // start with NULL defaults
// Use CS_OWNDC to avoid messing about restoring the context
// for every graphic operation.
// wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ;
// wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ;
// wxWin 2.0
wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
wndclass3.lpfnWndProc = (WNDPROC)wxWndProc;
wndclass3.cbClsExtra = 0;
wndclass3.cbWndExtra = sizeof( DWORD ); // was 4
@ -330,7 +330,7 @@ void wxApp::CleanUp()
if (wxWinHandleList)
delete wxWinHandleList ;
// do it as the very last thing because everything else can log messages
delete wxLog::SetActiveTarget(NULL);
}
@ -351,6 +351,8 @@ void wxApp::CommonInit()
wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
wxTheColourDatabase->Initialize();
wxInitializeStockLists();
wxInitializeStockObjects();
#if USE_WX_RESOURCES
@ -458,10 +460,10 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_
// Split command line into tokens, as in usual main(argc, argv)
char **command = new char*[50];
int count = 0;
char *buf = new char[strlen(m_lpCmdLine) + 1];
// Hangs around until end of app. in case
// user carries pointers to the tokens
@ -563,7 +565,7 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_
wxTheApp->SetTopWindow(NULL);
}
}
wxTheApp->OnExit();
wxApp::CleanUp();
@ -681,7 +683,7 @@ bool wxApp::DoMessage()
{
return FALSE;
}
// Process the message
if (!ProcessMessage((WXMSG *)&s_currentMsg))
{
@ -856,7 +858,7 @@ void wxApp::DeletePendingObjects()
while (node)
{
wxObject *obj = (wxObject *)node->Data();
delete obj;
if (wxPendingDelete.Member(obj))
@ -942,13 +944,13 @@ int wxApp::GetComCtl32Version() const
// have we loaded COMCTL32 yet?
HMODULE theModule = ::GetModuleHandle("COMCTL32");
int version = 0;
// if so, then we can check for the version
if (theModule)
{
// InitCommonControlsEx is unique to 4.7 and later
FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx");
if (! theProc)
{ // not found, must be 4.00
version = 400;