makefile for wxLayout sample

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index dc629191c1c27c263c8b2eeba29d7bdcd82fd066..07a2d29ccd26273fe84ea0ac9ac6b00c3de42342 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -234,8 +234,12 @@ bool wxApp::Initialize()
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
     lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" );
-    wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
-    ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+    if ( lb.lbHatch )
+    {
+        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+        ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+    }
+    //else: wxWindows resources are probably not linked in
 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
@@ -1117,7 +1121,11 @@ bool wxYield()
     MSG msg;
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)
+#ifdef __WXWINE__
+    while (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
+#else
     while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
+#endif
     {
         if ( !wxTheApp->DoMessage() )
             break;