adaption for CW 8.3 and quick hack for unicode text control size

[wxWidgets.git] / src / generic / renderg.cpp

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 709f98b45cc29a96ff2ab3aa6dd2fad7b3d655ff..fdfb957f7c1109f1d4e461670bd293006c3eb3d5 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -32,7 +32,9 @@
 #include "wx/dc.h"
 
 #include "wx/settings.h"
 #include "wx/dc.h"
 
 #include "wx/settings.h"

-
+#include "wx/splitter.h"
+#include "wx/dcmirror.h"
+#include "wx/module.h"

 #include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------


@@ -42,23 +44,73 @@
 class WXDLLEXPORT wxRendererGeneric : public wxRendererNative
 {
 public:
 class WXDLLEXPORT wxRendererGeneric : public wxRendererNative
 {
 public:

-    // draw the header control button (used by wxListCtrl)
+    wxRendererGeneric();
+

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

-    // draw the expanded/collapsed icon for a tree control item

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

+
+    virtual void DrawSplitterBorder(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    int flags = 0);
+
+    virtual void DrawSplitterSash(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxSize& size,
+                                  wxCoord position,
+                                  wxOrientation orient,
+                                  int flags = 0);
+
+
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+
+    virtual wxRendererVersion GetVersion() const
+    {
+        return wxRendererVersion(wxRendererVersion::Current_Version,
+                                 wxRendererVersion::Current_Age);
+    }
+
+
+    // Cleanup by deleting standard renderer
+    static void Cleanup();
+
+    // Get the generic object
+    static wxRendererGeneric* DoGetGeneric();
+
+protected:
+    // draw the rectange using the first pen for the left and top sides and
+    // the second one for the bottom and right ones
+    void DrawShadedRect(wxDC& dc, wxRect *rect,
+                        const wxPen& pen1, const wxPen& pen2);
+
+    // the standard pens
+    wxPen m_penBlack,
+          m_penDarkGrey,
+          m_penLightGrey,
+          m_penHighlight;
+
+    static wxRendererGeneric* sm_rendererGeneric;

 };
 
 // ============================================================================
 };
 
 // ============================================================================

-// implementation
+// wxRendererGeneric implementation

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

+// Get the generic object
+wxRendererGeneric* wxRendererGeneric::DoGetGeneric()
+{
+    if (!sm_rendererGeneric)
+        sm_rendererGeneric = new wxRendererGeneric;
+    return sm_rendererGeneric;
+}
+

 // ----------------------------------------------------------------------------
 // wxRendererGeneric creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRendererGeneric creation
 // ----------------------------------------------------------------------------


@@ -66,31 +118,62 @@ public:
 /* static */
 wxRendererNative& wxRendererNative::GetGeneric()
 {
 /* static */
 wxRendererNative& wxRendererNative::GetGeneric()
 {

-    static wxRendererGeneric s_rendererGeneric;
+    return * wxRendererGeneric::DoGetGeneric();
+}

 
 

-    return s_rendererGeneric;
+void wxRendererGeneric::Cleanup()
+{
+    if (sm_rendererGeneric)
+        delete sm_rendererGeneric;
+    
+    sm_rendererGeneric = NULL;

 }
 
 }
 

-// some platforms have their own renderers
-#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__)
+wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;

 
 

-/* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererGeneric::wxRendererGeneric()
+    : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)),
+      m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)),
+      m_penLightGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)),
+      m_penHighlight(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT))

 {
 {

-    return GetGeneric();

 }
 
 }
 

-#endif // platforms using their own renderers
+// ----------------------------------------------------------------------------
+// wxRendererGeneric helpers
+// ----------------------------------------------------------------------------
+
+void
+wxRendererGeneric::DrawShadedRect(wxDC& dc,
+                                  wxRect *rect,
+                                  const wxPen& pen1,
+                                  const wxPen& pen2)
+{
+    // draw the rectangle
+    dc.SetPen(pen1);
+    dc.DrawLine(rect->GetLeft(), rect->GetTop(),
+                rect->GetLeft(), rect->GetBottom());
+    dc.DrawLine(rect->GetLeft() + 1, rect->GetTop(),
+                rect->GetRight(), rect->GetTop());
+    dc.SetPen(pen2);
+    dc.DrawLine(rect->GetRight(), rect->GetTop(),
+                rect->GetRight(), rect->GetBottom());
+    dc.DrawLine(rect->GetLeft(), rect->GetBottom(),
+                rect->GetRight() + 1, rect->GetBottom());
+
+    // adjust the rect
+    rect->Inflate(-1);
+}

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxRendererGeneric drawing functions
+// tree/list ctrl drawing

 // ----------------------------------------------------------------------------
 
 void
 // ----------------------------------------------------------------------------
 
 void

-wxRendererGeneric::DrawHeaderButton(wxWindow *win,
+wxRendererGeneric::DrawHeaderButton(wxWindow * WXUNUSED(win),

                                     wxDC& dc,
                                     const wxRect& rect,
                                     wxDC& dc,
                                     const wxRect& rect,

-                                    int flags)
+                                    int WXUNUSED(flags))

 {
     const int CORNER = 1;
 
 {
     const int CORNER = 1;
 


@@ -99,19 +182,17 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win,
                   w = rect.width,
                   h = rect.height;
 
                   w = rect.width,
                   h = rect.height;
 

-    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);

 
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen(m_penBlack);

     dc.DrawLine( x+w-CORNER+1, y, x+w, y+h );  // right (outer)
     dc.DrawRectangle( x, y+h, w+1, 1 );        // bottom (outer)
 
     dc.DrawLine( x+w-CORNER+1, y, x+w, y+h );  // right (outer)
     dc.DrawRectangle( x, y+h, w+1, 1 );        // bottom (outer)
 

-    wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
-
-    dc.SetPen( pen );
+    dc.SetPen(m_penDarkGrey);

     dc.DrawLine( x+w-CORNER, y, x+w-1, y+h );  // right (inner)
     dc.DrawRectangle( x+1, y+h-1, w-2, 1 );    // bottom (inner)
 
     dc.DrawLine( x+w-CORNER, y, x+w-1, y+h );  // right (inner)
     dc.DrawRectangle( x+1, y+h-1, w-2, 1 );    // bottom (inner)
 

-    dc.SetPen( *wxWHITE_PEN );
+    dc.SetPen(m_penHighlight);

     dc.DrawRectangle( x, y, w-CORNER+1, 1 );   // top (outer)
     dc.DrawRectangle( x, y, 1, h );            // left (outer)
     dc.DrawLine( x, y+h-1, x+1, y+h-1 );
     dc.DrawRectangle( x, y, w-CORNER+1, 1 );   // top (outer)
     dc.DrawRectangle( x, y, 1, h );            // left (outer)
     dc.DrawLine( x, y+h-1, x+1, y+h-1 );


@@ -120,7 +201,7 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win,
 
 // draw the plus or minus sign
 void
 
 // draw the plus or minus sign
 void

-wxRendererGeneric::DrawTreeItemButton(wxWindow *win,
+wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),

                                       wxDC& dc,
                                       const wxRect& rect,
                                       int flags)
                                       wxDC& dc,
                                       const wxRect& rect,
                                       int flags)


@@ -128,19 +209,144 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *win,
     // white background
     dc.SetPen(*wxGREY_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);
     // white background
     dc.SetPen(*wxGREY_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);

-    dc.DrawRectangle(rect.Deflate(1, 2));
+    dc.DrawRectangle(rect);

 
     // black lines
     const wxCoord xMiddle = rect.x + rect.width/2;
     const wxCoord yMiddle = rect.y + rect.height/2;
 
 
     // black lines
     const wxCoord xMiddle = rect.x + rect.width/2;
     const wxCoord yMiddle = rect.y + rect.height/2;
 

+    // half of the length of the horz lines in "-" and "+"
+    const wxCoord halfWidth = rect.width/2 - 2;

     dc.SetPen(*wxBLACK_PEN);
     dc.SetPen(*wxBLACK_PEN);

-    dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle);
-    if ( flags & wxCONTROL_EXPANDED )
+    dc.DrawLine(xMiddle - halfWidth, yMiddle,
+                xMiddle + halfWidth + 1, yMiddle);
+
+    if ( !(flags & wxCONTROL_EXPANDED) )

     {
         // turn "-" into "+"
     {
         // turn "-" into "+"

-        dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3);
+        const wxCoord halfHeight = rect.height/2 - 2;
+        dc.DrawLine(xMiddle, yMiddle - halfHeight,
+                    xMiddle, yMiddle + halfHeight + 1);

     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// sash drawing
+// ----------------------------------------------------------------------------
+
+wxSplitterRenderParams
+wxRendererGeneric::GetSplitterParams(const wxWindow *win)
+{
+    // see below
+    wxCoord sashWidth,
+            border;
+
+    if ( win->HasFlag(wxSP_3DSASH) )
+        sashWidth = 7;
+    else if ( win->HasFlag(wxSP_NOSASH) )
+        sashWidth = 0;
+    else // no 3D effect
+        sashWidth = 3;
+
+    if ( win->HasFlag(wxSP_3DBORDER) )
+        border = 2;
+    else // no 3D effect
+        border = 0;
+
+    return wxSplitterRenderParams(sashWidth, border, false);
+}
+
+void
+wxRendererGeneric::DrawSplitterBorder(wxWindow *win,
+                                      wxDC& dc,
+                                      const wxRect& rectOrig,
+                                      int WXUNUSED(falgs))
+{
+    if ( win->HasFlag(wxSP_3DBORDER) )
+    {
+        wxRect rect = rectOrig;
+        DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+        DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey);
+    }
+}
+
+void
+wxRendererGeneric::DrawSplitterSash(wxWindow *win,
+                                    wxDC& dcReal,
+                                    const wxSize& sizeReal,
+                                    wxCoord position,
+                                    wxOrientation orient,
+                                    int WXUNUSED(flags))
+{
+    // to avoid duplicating the same code for horizontal and vertical sashes,
+    // simply mirror the DC instead if needed (i.e. if horz splitter)
+    wxMirrorDC dc(dcReal, orient != wxVERTICAL);
+    wxSize size = dc.Reflect(sizeReal);
+
+
+    // we draw a Win32-like grey sash with possible 3D border here:
+    //
+    //   ---- this is position
+    //  /
+    // v
+    // dWGGGDd
+    // GWGGGDB
+    // GWGGGDB  where G is light grey (face)
+    // GWGGGDB        W    white      (light)
+    // GWGGGDB        D    dark grey  (shadow)
+    // GWGGGDB        B    black      (dark shadow)
+    // GWGGGDB
+    // GWGGGDB  and lower letters are our border (already drawn)
+    // GWGGGDB
+    // wWGGGDd
+    //
+    // only the middle 3 columns are drawn unless wxSP_3D is specified
+
+    const wxCoord h = size.y;
+    wxCoord offset = 0;
+    
+    // If we're drawing the border, draw the sash 3d lines shorter
+    if ( win->HasFlag(wxSP_3DBORDER) )
+    {
+        offset = 1;
+    }
+
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));    
+    
+    if ( win->HasFlag(wxSP_3DSASH) )
+    {
+        // Draw the 3D sash
+        dc.DrawRectangle(position + 2, 0, 3, h);
+
+        dc.SetPen(m_penLightGrey);
+        dc.DrawLine(position, offset, position, h - offset);
+
+        dc.SetPen(m_penHighlight);
+        dc.DrawLine(position + 1, 0, position + 1, h);
+
+        dc.SetPen(m_penDarkGrey);
+        dc.DrawLine(position + 5, 0, position + 5, h);
+
+        dc.SetPen(m_penBlack);
+        dc.DrawLine(position + 6, offset, position + 6, h - offset);
+    }
+    else
+    {
+        // Draw a flat sash
+        dc.DrawRectangle(position, 0, 3, h);
+    }
+}
+
+// A module to allow cleanup of generic renderer.
+class wxGenericRendererModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
+public:
+    wxGenericRendererModule() {}
+    bool OnInit() { return true; };
+    void OnExit() { wxRendererGeneric::Cleanup(); };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)