A few tweaks and cleanups

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 0c5ef7d3b33e2a8cc072c9a67df3527bc8eea685..8283ec20d63680fad47c24cc543ed5a1ac2c2982 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -39,6 +39,14 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#ifndef ICON_BIG
+    #define ICON_BIG 1
+#endif
+
+#ifndef ICON_SMALL
+    #define ICON_SMALL 0
+#endif
+

 // ----------------------------------------------------------------------------
 // stubs for missing functions under MicroWindows
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // stubs for missing functions under MicroWindows
 // ----------------------------------------------------------------------------


@@ -64,21 +72,25 @@ extern const wxChar *wxCanvasClassName;
 // wxTopLevelWindowMSW implementation
 // ============================================================================
 
 // wxTopLevelWindowMSW implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// wxDialog helpers
+// ----------------------------------------------------------------------------
+

 // Dialog window proc
 LONG APIENTRY _EXPORT
 // Dialog window proc
 LONG APIENTRY _EXPORT

-wxDlgProc(HWND WXUNUSED(hWnd), UINT message, WPARAM WXUNUSED(wParam), LPARAM WXUNUSED(lParam))
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)

 {
 {

-    if ( message == WM_INITDIALOG )
+    switch ( message )

     {
     {

-        // for this message, returning TRUE tells system to set focus to the
-        // first control in the dialog box
-        return TRUE;
-    }
-    else
-    {
-        // for all the other ones, FALSE means that we didn't process the
-        // message
-        return FALSE;
+        case WM_INITDIALOG:
+            // for this message, returning TRUE tells system to set focus to the
+            // first control in the dialog box
+            return TRUE;
+
+        default:
+            // for all the other ones, FALSE means that we didn't process the
+            // message
+            return FALSE;

     }
 }
 
     }
 }
 


@@ -584,14 +596,26 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
 
 void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
 {
 
 void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
 {

-    // this sets m_icon
-    wxTopLevelWindowBase::SetIcon(icon);
+    SetIcons( wxIconBundle( icon ) );
+}
+
+void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
+{
+    wxTopLevelWindowBase::SetIcons(icons);

 
 #if defined(__WIN95__) && !defined(__WXMICROWIN__)
 
 #if defined(__WIN95__) && !defined(__WXMICROWIN__)

-    if ( m_icon.Ok() )
+    const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) );
+    if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 )
+    {
+        ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL,
+                       (LPARAM)GetHiconOf(sml) );
+    }
+
+    const wxIcon& big = icons.GetIcon( wxSize( 32, 32 ) );
+    if( big.Ok() && big.GetWidth() == 32 && big.GetHeight() == 32 )

     {
     {

-        ::SendMessage(GetHwnd(), WM_SETICON,
-                      (WPARAM)TRUE, (LPARAM)GetHiconOf(m_icon));
+        ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG,
+                       (LPARAM)GetHiconOf(big) );

     }
 #endif // __WIN95__
 }
     }
 #endif // __WIN95__
 }