Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 6ae03002758c16c94b65654c4f9744fc54dcd547..46f438191514712ab9304290f0c51d11ab71f5f0 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -31,6 +31,7 @@
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 

+#include "wx/dcgraph.h"

 #include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"


@@ -92,6 +93,12 @@
     #define TMT_TEXTCOLOR       3803
     #define TMT_BORDERCOLOR     3801
     #define TMT_EDGEFILLCOLOR   3808
     #define TMT_TEXTCOLOR       3803
     #define TMT_BORDERCOLOR     3801
     #define TMT_EDGEFILLCOLOR   3808

+
+    #define WP_MINBUTTON 15
+    #define WP_MAXBUTTON 17
+    #define WP_CLOSEBUTTON 18
+    #define WP_RESTOREBUTTON 21
+    #define WP_HELPBUTTON 23

 #endif
 
 #if defined(__WXWINCE__)
 #endif
 
 #if defined(__WXWINCE__)


@@ -181,18 +188,37 @@ public:
         DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags);
     }
 
         DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags);
     }
 

+    virtual void DrawTitleBarBitmap(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    wxTitleBarButton button,
+                                    int flags = 0);
+

     virtual wxSize GetCheckBoxSize(wxWindow *win);
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
     virtual wxSize GetCheckBoxSize(wxWindow *win);
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 

+    virtual int GetHeaderButtonMargin(wxWindow *win);
+

 private:
 private:

+    // wrapper of DrawFrameControl()
+    void DoDrawFrameControl(UINT type,
+                            UINT kind,
+                            wxWindow *win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags);
+

     // common part of Draw{PushButton,CheckBox,RadioBitmap}(): wraps
     // DrawFrameControl(DFC_BUTTON)
     void DoDrawButton(UINT kind,
                       wxWindow *win,
                       wxDC& dc,
                       const wxRect& rect,
     // common part of Draw{PushButton,CheckBox,RadioBitmap}(): wraps
     // DrawFrameControl(DFC_BUTTON)
     void DoDrawButton(UINT kind,
                       wxWindow *win,
                       wxDC& dc,
                       const wxRect& rect,

-                      int flags);
+                      int flags)
+    {
+        DoDrawFrameControl(DFC_BUTTON, kind, win, dc, rect, flags);
+    }

 
     wxDECLARE_NO_COPY_CLASS(wxRendererMSW);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxRendererMSW);
 };


@@ -262,9 +288,24 @@ public:
             m_rendererNative.DrawRadioBitmap(win, dc, rect, flags);
     }
 
             m_rendererNative.DrawRadioBitmap(win, dc, rect, flags);
     }
 

+    virtual void DrawTitleBarBitmap(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    wxTitleBarButton button,
+                                    int flags = 0);
+

     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 private:
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 private:

+    // wrapper around DrawThemeBackground() translating flags to NORMAL/HOT/
+    // PUSHED/DISABLED states (and so suitable for drawing anything
+    // button-like)
+    void DoDrawButtonLike(HTHEME htheme,
+                          int part,
+                          wxDC& dc,
+                          const wxRect& rect,
+                          int flags);
+

     // common part of DrawCheckBox(), DrawPushButton() and DrawRadioBitmap()
     bool DoDrawXPButton(int kind,
                         wxWindow *win,
     // common part of DrawCheckBox(), DrawPushButton() and DrawRadioBitmap()
     bool DoDrawXPButton(int kind,
                         wxWindow *win,


@@ -354,8 +395,12 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       const wxRect& rect,
                                       int flags)
 {
                                       const wxRect& rect,
                                       int flags)
 {

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+    

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )


@@ -367,14 +412,19 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
 }
 
 void
 }
 
 void

-wxRendererMSW::DoDrawButton(UINT kind,
-                            wxWindow * WXUNUSED(win),
-                            wxDC& dc,
-                            const wxRect& rect,
-                            int flags)
+wxRendererMSW::DoDrawFrameControl(UINT type,
+                                  UINT kind,
+                                  wxWindow * WXUNUSED(win),
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags)

 {
 {

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int style = kind;
     if ( flags & wxCONTROL_CHECKED )
 
     int style = kind;
     if ( flags & wxCONTROL_CHECKED )


@@ -387,8 +437,13 @@ wxRendererMSW::DoDrawButton(UINT kind,
         style |= DFCS_PUSHED;
     if ( flags & wxCONTROL_CURRENT )
         style |= DFCS_HOT;
         style |= DFCS_PUSHED;
     if ( flags & wxCONTROL_CURRENT )
         style |= DFCS_HOT;

+    if ( flags & wxCONTROL_UNDETERMINED )
+        // Using DFCS_BUTTON3STATE here doesn't work (as might be expected),
+        // use the following two styles to get the same look of a check box
+        // in the undetermined state.
+        style |= DFCS_INACTIVE | DFCS_CHECKED;

 
 

-    ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, DFC_BUTTON, style);
+    ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style);

 }
 
 void
 }
 
 void


@@ -411,6 +466,44 @@ wxRendererMSW::DrawPushButton(wxWindow *win,
     DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags);
 }
 
     DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags);
 }
 

+void
+wxRendererMSW::DrawTitleBarBitmap(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  wxTitleBarButton button,
+                                  int flags)
+{
+    UINT kind;
+    switch ( button )
+    {
+        case wxTITLEBAR_BUTTON_CLOSE:
+            kind = DFCS_CAPTIONCLOSE;
+            break;
+
+        case wxTITLEBAR_BUTTON_MAXIMIZE:
+            kind = DFCS_CAPTIONMAX;
+            break;
+
+        case wxTITLEBAR_BUTTON_ICONIZE:
+            kind = DFCS_CAPTIONMIN;
+            break;
+
+        case wxTITLEBAR_BUTTON_RESTORE:
+            kind = DFCS_CAPTIONRESTORE;
+            break;
+
+        case wxTITLEBAR_BUTTON_HELP:
+            kind = DFCS_CAPTIONHELP;
+            break;
+
+        default:
+            wxFAIL_MSG( "unsupported title bar button" );
+            return;
+    }
+
+    DoDrawFrameControl(DFC_CAPTION, kind, win, dc, rect, flags);
+}
+

 wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win))
 {
     return wxSize(::GetSystemMetrics(SM_CXMENUCHECK),
 wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win))
 {
     return wxSize(::GetSystemMetrics(SM_CXMENUCHECK),


@@ -440,6 +533,11 @@ int wxRendererMSW::GetHeaderButtonHeight(wxWindow * WXUNUSED(win))
     return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT;
 }
 
     return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT;
 }
 

+int wxRendererMSW::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+    return 10;
+}
+

 // Uses the theme to draw the border and fill for something like a wxTextCtrl
 void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
 // Uses the theme to draw the border and fill for something like a wxTextCtrl
 void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {


@@ -531,8 +629,12 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
         return;
     }
 
         return;
     }
 

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int state;
     if ( flags & wxCONTROL_PRESSED )
 
     int state;
     if ( flags & wxCONTROL_PRESSED )


@@ -570,8 +672,12 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 

+    wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int state;
     if ( flags & wxCONTROL_PRESSED )
 
     int state;
     if ( flags & wxCONTROL_PRESSED )


@@ -612,8 +718,12 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
         return;
     }
 
         return;
     }
 

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     wxUxThemeEngine::Get()->DrawThemeBackground
 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     wxUxThemeEngine::Get()->DrawThemeBackground


@@ -638,29 +748,28 @@ wxRendererXP::DoDrawXPButton(int kind,
     if ( !hTheme )
         return false;
 
     if ( !hTheme )
         return false;
 

-    RECT r;
-    wxCopyRectToRECT(rect, r);
+    DoDrawButtonLike(hTheme, kind, dc, rect, flags);

 
 

-    // determine the base state depending on the button kind
-    int state;
-    switch ( kind )
-    {
-        case BP_PUSHBUTTON:
-            state = PBS_NORMAL;
-            break;
+    return true;
+}

 
 

-        case BP_RADIOBUTTON:
-            state = RBS_UNCHECKEDNORMAL;
-            break;
+void
+wxRendererXP::DoDrawButtonLike(HTHEME htheme,
+                               int part,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags)
+{
+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );

 
 

-        case BP_CHECKBOX:
-            state = CBS_UNCHECKEDNORMAL;
-            break;
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);

 
 

-        default:
-            wxFAIL_MSG( "unknown button kind" );
-            return false;
-    }
+    RECT r;
+    wxCopyRectToRECT(adjustedRect, r);
+
+    // the base state is always 1, whether it is PBS_NORMAL,
+    // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL
+    int state = 1;

 
     // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED
     enum
 
     // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED
     enum


@@ -687,20 +796,63 @@ wxRendererXP::DoDrawXPButton(int kind,
     else if ( flags & wxCONTROL_CURRENT )
         state += HOT_OFFSET;
     // wxCONTROL_ISDEFAULT flag is only valid for push buttons
     else if ( flags & wxCONTROL_CURRENT )
         state += HOT_OFFSET;
     // wxCONTROL_ISDEFAULT flag is only valid for push buttons

-    else if ( kind == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) )
+    else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) )

         state = PBS_DEFAULTED;
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
         state = PBS_DEFAULTED;
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (

-                                hTheme,
+                                htheme,

                                 GetHdcOf(dc.GetTempHDC()),
                                 GetHdcOf(dc.GetTempHDC()),

-                                kind,
+                                part,

                                 state,
                                 &r,
                                 NULL
                             );
                                 state,
                                 &r,
                                 NULL
                             );

+}

 
 

-    return true;
+void
+wxRendererXP::DrawTitleBarBitmap(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 wxTitleBarButton button,
+                                 int flags)
+{
+    wxUxThemeHandle hTheme(win, L"WINDOW");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags);
+        return;
+    }
+
+    int part;
+    switch ( button )
+    {
+        case wxTITLEBAR_BUTTON_CLOSE:
+            part = WP_CLOSEBUTTON;
+            break;
+
+        case wxTITLEBAR_BUTTON_MAXIMIZE:
+            part = WP_MAXBUTTON;
+            break;
+
+        case wxTITLEBAR_BUTTON_ICONIZE:
+            part = WP_MINBUTTON;
+            break;
+
+        case wxTITLEBAR_BUTTON_RESTORE:
+            part = WP_RESTOREBUTTON;
+            break;
+
+        case wxTITLEBAR_BUTTON_HELP:
+            part = WP_HELPBUTTON;
+            break;
+
+        default:
+            wxFAIL_MSG( "unsupported title bar button" );
+            return;
+    }
+
+    DoDrawButtonLike(hTheme, part, dc, rect, flags);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------