implemented wxNativeFontInfo::operator=() when wxUSE_PANGO, this fixes crashes when...

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 6c4e94bacde93a0276d4fbebbc085c34b4e91044..688ca701e25130ed758c43258032a42504f67c0e 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -286,7 +286,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         (
          NULL,
          _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
-         _T("wxWindows Fatal Error"),
+         _T("wxWidgets Fatal Error"),
          MB_ICONERROR | MB_OK
         );
 
@@ -322,20 +322,19 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     RegisterWindowClasses();
 
-#if defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     // Create the brush for disabling bitmap buttons
-
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
     lb.lbColor = 0;
     lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {
-        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+        wxDisableButtonBrush = ::CreateBrushIndirect( &lb );
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
-    //else: wxWindows resources are probably not linked in
-#endif
+    //else: wxWidgets resources are probably not linked in
+#endif // !__WXMICROWIN__ && !__WXWINCE__
 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
@@ -770,7 +769,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 bool wxApp::OnExceptionInMainLoop()
 {
     // ask the user about what to do: use the Win32 API function here as it
-    // could be dangerous to use any wxWindows code in this state
+    // could be dangerous to use any wxWidgets code in this state
     switch (
             ::MessageBox
               (