removed the SetMargins call

[wxWidgets.git] / src / univ / themes / win32.cpp

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index f072921aae67256add6cc630c0b55b8201f32693..4142f5940fae2867e15f6ecc487d3f52d24701c3 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -475,6 +475,14 @@ private:
 
     wxFont m_titlebarFont;
 
+    // the checked and unchecked bitmaps for DrawCheckItem()
+    wxBitmap m_bmpCheckBitmaps[IndicatorStatus_Max];
+
+    // the bitmaps returned by GetIndicator()
+    wxBitmap m_bmpIndicators[IndicatorType_Max]
+                            [IndicatorState_Max]
+                            [IndicatorStatus_Max];
+
     // titlebar icons:
     wxBitmap m_bmpFrameButtons[FrameButton_Max];
 
@@ -641,8 +649,8 @@ private:
 
 static const char *frame_button_close_xpm[] = {
 "12 10 2 1",
-"      c None",
-".     c black",
+"         c None",
+".        c black",
 "            ",
 "  ..    ..  ",
 "   ..  ..   ",
@@ -656,8 +664,8 @@ static const char *frame_button_close_xpm[] = {
 
 static const char *frame_button_help_xpm[] = {
 "12 10 2 1",
-"      c None",
-".     c #000000",
+"         c None",
+".        c #000000",
 "    ....    ",
 "   ..  ..   ",
 "   ..  ..   ",
@@ -671,8 +679,8 @@ static const char *frame_button_help_xpm[] = {
 
 static const char *frame_button_maximize_xpm[] = {
 "12 10 2 1",
-"      c None",
-".     c #000000",
+"         c None",
+".        c #000000",
 " .........  ",
 " .........  ",
 " .       .  ",
@@ -686,8 +694,8 @@ static const char *frame_button_maximize_xpm[] = {
 
 static const char *frame_button_minimize_xpm[] = {
 "12 10 2 1",
-"      c None",
-".     c #000000",
+"         c None",
+".        c #000000",
 "            ",
 "            ",
 "            ",
@@ -701,8 +709,8 @@ static const char *frame_button_minimize_xpm[] = {
 
 static const char *frame_button_restore_xpm[] = {
 "12 10 2 1",
-"      c None",
-".     c #000000",
+"         c None",
+".        c #000000",
 "   ......   ",
 "   ......   ",
 "   .    .   ",
@@ -1068,7 +1076,7 @@ static const char *pressed_unchecked_radio_xpm[] = {
 };
 
 static const char **
-    bmpIndicators[IndicatorType_Max][IndicatorState_Max][IndicatorStatus_Max] =
+    xpmIndicators[IndicatorType_Max][IndicatorState_Max][IndicatorStatus_Max] =
 {
     // checkboxes first
     {
@@ -1110,6 +1118,12 @@ static const char **
     }
 };
 
+static const char **xpmChecked[IndicatorStatus_Max] =
+{
+    checked_item_xpm,
+    unchecked_item_xpm
+};
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -1323,7 +1337,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
         case TITLEBAR_ACTIVE:   return wxColour(GetSysColor(COLOR_ACTIVECAPTION));
         case TITLEBAR_TEXT:     return wxColour(GetSysColor(COLOR_INACTIVECAPTIONTEXT));
         case TITLEBAR_ACTIVE_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT));
-        
+
         case DESKTOP:           return wxColour(0x808000);
 #else // !__WXMSW__
         // use the standard Windows colours elsewhere
@@ -2171,8 +2185,16 @@ void wxWin32Renderer::DrawCheckItem(wxDC& dc,
     }
     else // use default bitmap
     {
-        bmp = wxBitmap(flags & wxCONTROL_CHECKED ? checked_item_xpm
-                                                 : unchecked_item_xpm);
+        IndicatorStatus i = flags & wxCONTROL_CHECKED
+                                ? IndicatorStatus_Checked
+                                : IndicatorStatus_Unchecked;
+
+        if ( !m_bmpCheckBitmaps[i].Ok() )
+        {
+            m_bmpCheckBitmaps[i] = wxBitmap(xpmChecked[i]);
+        }
+
+        bmp = m_bmpCheckBitmaps[i];
     }
 
     dc.DrawBitmap(bmp, rect.x, rect.y + (rect.height - bmp.GetHeight()) / 2 - 1,
@@ -2207,14 +2229,19 @@ wxBitmap wxWin32Renderer::GetIndicator(IndicatorType indType, int flags)
                                     ? IndicatorStatus_Checked
                                     : IndicatorStatus_Unchecked;
 
-    const char **xpm = bmpIndicators[indType][indState][indStatus];
-    if (xpm)
+    wxBitmap bmp = m_bmpIndicators[indType][indState][indStatus];
+    if ( !bmp.Ok() )
     {
-        wxBitmap bmp(xpm);
-       return bmp;
+        const char **xpm = xpmIndicators[indType][indState][indStatus];
+        if ( xpm )
+        {
+            // create and cache it
+            bmp = wxBitmap(xpm);
+            m_bmpIndicators[indType][indState][indStatus] = bmp;
+        }
     }
-    else
-       return wxNullBitmap;
+
+    return bmp;
 }
 
 void wxWin32Renderer::DrawCheckOrRadioButton(wxDC& dc,
@@ -2273,19 +2300,16 @@ void wxWin32Renderer::DrawRadioButton(wxDC& dc,
                                       wxAlignment align,
                                       int indexAccel)
 {
-    if (bitmap.Ok())
-        DrawCheckOrRadioButton(dc, label,
-                              bitmap,
-                           rect, flags, align, indexAccel,
-                            FOCUS_RECT_OFFSET_Y); // default focus rect offset
+    wxBitmap bmp;
+    if ( bitmap.Ok() )
+        bmp = bitmap;
     else
-    {
-       wxBitmap rbitmap(GetRadioBitmap(flags));
-        DrawCheckOrRadioButton(dc, label,
-                              rbitmap,
+        bmp = GetRadioBitmap(flags);
+
+    DrawCheckOrRadioButton(dc, label,
+                           bmp,
                            rect, flags, align, indexAccel,
-                              FOCUS_RECT_OFFSET_Y); // default focus rect offset
-    }
+                           FOCUS_RECT_OFFSET_Y); // default focus rect offset
 }
 
 void wxWin32Renderer::DrawCheckButton(wxDC& dc,
@@ -2296,19 +2320,16 @@ void wxWin32Renderer::DrawCheckButton(wxDC& dc,
                                       wxAlignment align,
                                       int indexAccel)
 {
-    if (bitmap.Ok())
-        DrawCheckOrRadioButton(dc, label,
-                              bitmap,
-                             rect, flags, align, indexAccel,
-                             0); // no focus rect offset for checkboxes
+    wxBitmap bmp;
+    if ( bitmap.Ok() )
+        bmp = bitmap;
     else
-    {
-           wxBitmap cbitmap(GetCheckBitmap(flags));
-        DrawCheckOrRadioButton(dc, label,
-                             cbitmap,
-                             rect, flags, align, indexAccel,
-                              0); // no focus rect offset for checkboxes
-    }
+        bmp = GetCheckBitmap(flags);
+
+    DrawCheckOrRadioButton(dc, label,
+                           bmp,
+                           rect, flags, align, indexAccel,
+                           0); // no focus rect offset for checkboxes
 }
 
 // ----------------------------------------------------------------------------
@@ -3445,7 +3466,7 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc,
 
     dc.SetFont(m_titlebarFont);
     dc.SetTextForeground(col);
-    
+
     wxCoord textW;
     dc.GetTextExtent(title, &textW, NULL);
     if ( textW > r.width )
@@ -3472,11 +3493,11 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc,
             s << title[i];
         }
         s << wxT("...");
-        dc.DrawLabel(s, wxNullBitmap, r, 
+        dc.DrawLabel(s, wxNullBitmap, r,
                      wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
     }
     else
-        dc.DrawLabel(title, wxNullBitmap, r, 
+        dc.DrawLabel(title, wxNullBitmap, r,
                      wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
 }
 
@@ -3914,6 +3935,7 @@ bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control,
     if ( event.ButtonDown() )
     {
         wxWindow *win = control->GetInputWindow();
+
         if ( wxWindow::FindFocus() != control->GetInputWindow() )
         {
             win->SetFocus();
@@ -4184,12 +4206,27 @@ bool wxWin32StatusBarInputHandler::IsOnGrip(wxWindow *statbar,
                                             const wxPoint& pt) const
 {
     if ( statbar->HasFlag(wxST_SIZEGRIP) &&
-            statbar->GetParent()->HasFlag(wxRESIZE_BORDER) )
+         statbar->GetParent()->HasFlag(wxRESIZE_BORDER) )
     {
-        wxSize sizeSbar = statbar->GetSize();
+        wxTopLevelWindow *
+            parentTLW = wxDynamicCast(statbar->GetParent(), wxTopLevelWindow);
+
+        wxCHECK_MSG( parentTLW, FALSE,
+                     _T("the status bar should be a child of a TLW") );
 
-        return (sizeSbar.x - pt.x) < (wxCoord)STATUSBAR_GRIP_SIZE &&
-               (sizeSbar.y - pt.y) < (wxCoord)STATUSBAR_GRIP_SIZE;
+        // a maximized window can't be resized anyhow
+        if ( !parentTLW->IsMaximized() )
+        {
+            // VZ: I think that the standard Windows behaviour is to only
+            //     show the resizing cursor when the mouse is on top of the
+            //     grip itself but apparently different Windows versions behave
+            //     differently (?) and it seems a better UI to allow resizing
+            //     the status bar even when the mouse is above the grip
+            wxSize sizeSbar = statbar->GetSize();
+
+            int diff = sizeSbar.x - pt.x;
+            return diff >= 0 && diff < (wxCoord)STATUSBAR_GRIP_SIZE;
+        }
     }
 
     return FALSE;
@@ -4256,17 +4293,16 @@ bool wxWin32FrameInputHandler::HandleMouse(wxInputConsumer *consumer,
 {
     if ( event.LeftDClick() )
     {
-        wxTopLevelWindow *tlw = 
+        wxTopLevelWindow *tlw =
             wxStaticCast(consumer->GetInputWindow(), wxTopLevelWindow);
 
         long hit = tlw->HitTest(event.GetPosition());
 
         if ( hit == wxHT_TOPLEVEL_TITLEBAR )
         {
-            tlw->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, 
-                               tlw->IsMaximized() ? 
-                                   wxTOPLEVEL_BUTTON_RESTORE : 
-                                   wxTOPLEVEL_BUTTON_MAXIMIZE);
+            tlw->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK,
+                               tlw->IsMaximized() ? wxTOPLEVEL_BUTTON_RESTORE
+                                                  : wxTOPLEVEL_BUTTON_MAXIMIZE);
             return TRUE;
         }
     }