Applied patch [ 1310251 ] Fixed a pixel depth bug converting wxImageb to wxBitmap

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index e5e40c269c39f916bcccc518a3f48df8deeaf94f..f8897c01853fad576b3f24df32f15647bc4568d0 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -312,21 +312,23 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
     return (WXHWND)hwndParent;
 }
 
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
 bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
 {
     SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
     if (!info) return false;
     return SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info) == TRUE;
 }
+#endif
 
 WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     WXLRESULT rc = 0;
     bool processed = false;
 
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     switch ( message )
     {
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
         case WM_ACTIVATE:
         {
             SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
@@ -358,8 +360,8 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
             }
             break;
         }
-#endif
     }
+#endif
 
     if ( !processed )
         rc = wxTopLevelWindowBase::MSWWindowProc(message, wParam, lParam);
@@ -1122,13 +1124,17 @@ wxDlgProc(HWND hDlg,
             return FALSE;
         }
 
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
         case WM_SETTINGCHANGE:
         {
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
             wxTopLevelWindow *tlw = wxDynamicCast(wxGetWindowFromHWND(hDlg), wxTopLevelWindow);
             if(tlw) return tlw->HandleSettingChange(wParam,lParam) ? TRUE : FALSE;
-        }
+#else
+            wxUnusedVar(wParam);
+            wxUnusedVar(lParam);
 #endif
+            break;
+        }
     }
 
     // for almost all messages, returning FALSE means that we didn't process