use PROOF_QUALITY in LOGFONT by default

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 4763dfe7bdec6d4f1c9319a2e27f750961148302..0ec34ab54c752c1953cd142dbd52ddc2c9e07ac7 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/renderer.cpp
+// Name:        src/msw/renderer.cpp

 // Purpose:     implementation of wxRendererNative for Windows
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxRendererNative for Windows
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -28,22 +28,29 @@
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/dc.h"

+    #include "wx/settings.h"

 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"

-#include "wx/settings.h"

 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON

+    #define BP_PUSHBUTTON      1

     #define BP_CHECKBOX        3
     #define CBS_UNCHECKEDNORMAL 1
     #define CBS_CHECKEDNORMAL   (CBS_UNCHECKEDNORMAL + 4)
     #define CBS_MIXEDNORMAL     (CBS_CHECKEDNORMAL + 4)
 
     #define BP_CHECKBOX        3
     #define CBS_UNCHECKEDNORMAL 1
     #define CBS_CHECKEDNORMAL   (CBS_UNCHECKEDNORMAL + 4)
     #define CBS_MIXEDNORMAL     (CBS_CHECKEDNORMAL + 4)
 

+    #define PBS_NORMAL          1
+    #define PBS_HOT             2
+    #define PBS_PRESSED         3
+    #define PBS_DISABLED        4
+    #define PBS_DEFAULTED       5
+

     #define CP_DROPDOWNBUTTON  1
 
     #define CBXS_NORMAL        1
     #define CP_DROPDOWNBUTTON  1
 
     #define CBXS_NORMAL        1


@@ -83,6 +90,11 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
                                         const wxRect& rect,
                                         int flags = 0);
 

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

 private:
     DECLARE_NO_COPY_CLASS(wxRendererMSW)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxRendererMSW)
 };


@@ -122,10 +134,15 @@ public:
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);

-    virtual void DrawCheckButton(wxWindow *win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags = 0);
+    virtual void DrawCheckBox(wxWindow *win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0);
+
+    virtual void DrawPushButton(wxWindow *win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags = 0);

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


@@ -179,6 +196,27 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
     ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
 }
 
     ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
 }
 

+void
+wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags)
+{
+    RECT r;
+    r.left = rect.GetLeft();
+    r.top = rect.GetTop();
+    r.bottom = rect.y + rect.height;
+    r.right = rect.x + rect.width;
+
+    int style = DFCS_BUTTONPUSH;
+    if ( flags & wxCONTROL_DISABLED )
+        style |= DFCS_INACTIVE;
+    if ( flags & wxCONTROL_PRESSED )
+        style |= DFCS_PUSHED | DFCS_FLAT;
+
+    ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
+}
+

 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================
 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================


@@ -297,15 +335,15 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
 }
 
 void
 }
 
 void

-wxRendererXP::DrawCheckButton(wxWindow *win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags)
+wxRendererXP::DrawCheckBox(wxWindow *win,
+                           wxDC& dc,
+                           const wxRect& rect,
+                           int flags)

 {
     wxUxThemeHandle hTheme(win, L"BUTTON");
     if ( !hTheme )
     {
 {
     wxUxThemeHandle hTheme(win, L"BUTTON");
     if ( !hTheme )
     {

-        m_rendererNative.DrawCheckButton(win, dc, rect, flags);
+        m_rendererNative.DrawCheckBox(win, dc, rect, flags);

         return;
     }
 
         return;
     }
 


@@ -339,6 +377,46 @@ wxRendererXP::DrawCheckButton(wxWindow *win,
                             );
 }
 
                             );
 }
 

+void
+wxRendererXP::DrawPushButton(wxWindow * win,
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)
+{
+    wxUxThemeHandle hTheme(win, L"BUTTON");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawPushButton(win, dc, rect, flags);
+        return;
+    }
+
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int state;
+    if ( flags & wxCONTROL_PRESSED )
+        state = PBS_PRESSED;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = PBS_HOT;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = PBS_DISABLED;
+    else if ( flags & wxCONTROL_ISDEFAULT )
+        state = PBS_DEFAULTED;
+    else
+        state = PBS_NORMAL;
+
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GetHdcOf(dc),
+                                BP_PUSHBUTTON,
+                                state,
+                                &r,
+                                NULL
+                            );
+
+}
+

 // ----------------------------------------------------------------------------
 // splitter drawing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // splitter drawing
 // ----------------------------------------------------------------------------


@@ -395,4 +473,3 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 }
 
 #endif // wxUSE_UXTHEME
 }
 
 #endif // wxUSE_UXTHEME

-