wxFrame: OnSize() has a SEGV if wxFrame has no child. Fixed.

[wxWidgets.git] / src / msw / app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 40327418c1c0ed87910b3c12aff427dad2ee3c22..47b65da5b4f91040d4f0f617c7603372e91da2e1 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -59,7 +59,7 @@ extern wxList wxPendingDelete;
 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 
 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 

-HANDLE wxhInstance = 0;
+HINSTANCE wxhInstance = 0;

 static MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 static MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 


@@ -94,9 +94,9 @@ long wxApp::sm_lastMessageTime = 0;
 static HINSTANCE gs_hRichEdit = NULL;
 #endif
 
 static HINSTANCE gs_hRichEdit = NULL;
 #endif
 

-bool wxApp::Initialize(WXHANDLE instance)
+bool wxApp::Initialize(WXHINSTANCE instance)

 {
 {

-  HANDLE hInstance = (HANDLE)instance;
+  HINSTANCE hInstance = (HINSTANCE) instance;

 
   CommonInit();
 
 
   CommonInit();
 


@@ -248,7 +248,7 @@ bool wxApp::RegisterWindowClasses()
   wndclass2.hIcon         = NULL;
   wndclass2.hCursor       = NULL;
 //  wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;
   wndclass2.hIcon         = NULL;
   wndclass2.hCursor       = NULL;
 //  wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;

-  wndclass2.hbrBackground = GetStockObject( LTGRAY_BRUSH );
+  wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );

   wndclass2.lpszMenuName  = NULL;
   wndclass2.lpszClassName = wxPanelClassName;
   if (!RegisterClass( &wndclass2 ))
   wndclass2.lpszMenuName  = NULL;
   wndclass2.lpszClassName = wxPanelClassName;
   if (!RegisterClass( &wndclass2 ))


@@ -337,7 +337,7 @@ void wxApp::CleanUp()
 
 void wxApp::CommonInit()
 {
 
 void wxApp::CommonInit()
 {

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   wxBuffer = new char[1500];
 #else
   wxBuffer = new char[BUFSIZ + 512];
   wxBuffer = new char[1500];
 #else
   wxBuffer = new char[BUFSIZ + 512];


@@ -648,7 +648,7 @@ wxApp::wxApp()
   m_appName = "";
   argc = 0;
   argv = NULL;
   m_appName = "";
   argc = 0;
   argv = NULL;

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   m_printMode = wxPRINT_WINDOWS;
 #else
   m_printMode = wxPRINT_POSTSCRIPT;
   m_printMode = wxPRINT_WINDOWS;
 #else
   m_printMode = wxPRINT_POSTSCRIPT;