define UDM_{SETRANGE|SETPOS|GETPOS}32 if we don't have them in the headers to allow...

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 0b54ae2c1fc23cdf34dcb2d2eb4f5d7e4b86acdf..98293ee53d5630c78e4d88029dd70726748d9b0b 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"

+#include "wx/settings.h"

 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 


@@ -44,6 +45,17 @@
     #define CBXS_HOT           2
     #define CBXS_PRESSED       3
     #define CBXS_DISABLED      4
     #define CBXS_HOT           2
     #define CBXS_PRESSED       3
     #define CBXS_DISABLED      4

+
+    #define TVP_GLYPH                  2
+    
+    #define GLPS_CLOSED                        1
+    #define GLPS_OPENED         2
+
+    #define HP_HEADERITEM       1
+
+    #define HIS_NORMAL          1
+    #define HIS_HOT             2
+    #define HIS_PRESSED         3

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -96,6 +108,14 @@ public:
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);

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

 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)
 };


@@ -126,6 +146,10 @@ wxRendererNative& wxRendererMSW::Get()
     return s_rendererMSW;
 }
 
     return s_rendererMSW;
 }
 

+#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
+#define DFCS_FLAT 0
+#endif
+

 void
 wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       wxDC& dc,
 void
 wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       wxDC& dc,


@@ -192,7 +216,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
         wxUxThemeEngine::Get()->DrawThemeBackground
                                 (
                                     hTheme,
         wxUxThemeEngine::Get()->DrawThemeBackground
                                 (
                                     hTheme,

-                                    dc.GetHDC(),
+                                    (HDC) dc.GetHDC(),

                                     CP_DROPDOWNBUTTON,
                                     state,
                                     &r,
                                     CP_DROPDOWNBUTTON,
                                     state,
                                     &r,


@@ -240,40 +264,76 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->HasFlag(wxSP_NO_XP_THEME) )
     {
 {
     if ( !win->HasFlag(wxSP_NO_XP_THEME) )
     {

-        wxUxThemeHandle hTheme(win, L"WINDOW");
-        if ( hTheme )
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)));
+        if ( orient == wxVERTICAL )
+        {
+            dc.DrawRectangle(position, 0, SASH_WIDTH, size.y);
+        }
+        else // wxHORIZONTAL

         {
         {

-            RECT rect;
-            if ( orient == wxVERTICAL )
-            {
-                rect.left = position;
-                rect.right = position + SASH_WIDTH;
-                rect.top = 0;
-                rect.bottom = size.y;
-            }
-            else // wxHORIZONTAL
-            {
-                rect.left = 0;
-                rect.right = size.x;
-                rect.top = position;
-                rect.bottom = position + SASH_WIDTH;
-            }
-
-            wxUxThemeEngine::Get()->DrawThemeBackground
-                                    (
-                                        (WXHTHEME)hTheme,
-                                        dc.GetHDC(),
-                                        29, // WP_DIALOG: dlg background
-                                        0, // no particular state
-                                        &rect,
-                                        NULL
-                                    );
-            return;
+            dc.DrawRectangle(0, position, size.x, SASH_WIDTH);

         }
         }

+
+        return;

     }
 
     m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags);
 }
 
     }
 
     m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags);
 }
 

+void
+wxRendererXP::DrawTreeItemButton(wxWindow *win, 
+                                 wxDC &dc, 
+                                 const wxRect &rect, 
+                                 int flags) 
+{
+    wxUxThemeHandle hTheme(win, L"TREEVIEW");
+    RECT r;
+    r.left = rect.x;
+    r.top = rect.y;
+    r.right = rect.x + rect.width;
+    r.bottom = rect.y + rect.height;
+    int state = (flags & wxCONTROL_EXPANDED) ? GLPS_OPENED : GLPS_CLOSED;
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                                (
+                                    hTheme,
+                                    (HDC) dc.GetHDC(),
+                                    TVP_GLYPH,
+                                    state,
+                                    &r,
+                                    NULL
+                                );
+}
+
+void
+wxRendererXP::DrawHeaderButton(wxWindow *win, 
+                               wxDC &dc, 
+                               const wxRect &rect, 
+                               int flags) 
+{
+    wxUxThemeHandle hTheme(win, L"HEADER");
+    RECT r;
+    r.left = rect.x;
+    r.top = rect.y;
+    r.right = rect.x + rect.width;
+    r.bottom = rect.y + rect.height;
+    int state;
+    if ( flags & wxCONTROL_PRESSED )
+        state = HIS_PRESSED;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = HIS_HOT;
+    else
+        state = HIS_NORMAL;
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                                (
+                                    hTheme,
+                                    (HDC) dc.GetHDC(),
+                                    HP_HEADERITEM,
+                                    state,
+                                    &r,
+                                    NULL
+                                );
+}
+

 #endif // wxUSE_UXTHEME
 
 #endif // wxUSE_UXTHEME