X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e417065df626cf8f70d9aac2c333da2e1a4e44c..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/renderer.h

diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index 54929645c5..16bd75f9bf 100644
--- a/include/wx/renderer.h
+++ b/include/wx/renderer.h
@@ -254,7 +254,34 @@ public:
     // draw the focus rectangle around the label contained in the given rect
     //
     // only wxCONTROL_SELECTED makes sense in flags here
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0;
+    virtual void DrawFocusRect(wxWindow* win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0) = 0;
+
+    // Draw a native wxChoice
+    virtual void DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags = 0) = 0;
+
+    // Draw a native wxComboBox
+    virtual void DrawComboBox(wxWindow* win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0) = 0;
+
+    // Draw a native wxTextCtrl frame
+    virtual void DrawTextCtrl(wxWindow* win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0) = 0;
+
+    // Draw a native wxRadioButton (just the graphical portion)
+    virtual void DrawRadioButton(wxWindow* win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags = 0) = 0;
 
     // geometry functions
     // ------------------
@@ -374,7 +401,7 @@ public:
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
-                              int flags = 0 )
+                              int flags = 0)
         { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
 
     virtual wxSize GetCheckBoxSize(wxWindow *win)
@@ -383,18 +410,45 @@ public:
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags = 0 )
+                                int flags = 0)
         { m_rendererNative.DrawPushButton( win, dc, rect, flags ); }
 
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
-                                       int flags = 0 )
+                                       int flags = 0)
         { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); }
 
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0)
+    virtual void DrawFocusRect(wxWindow* win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0)
         { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); }
 
+    virtual void DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags = 0)
+        { m_rendererNative.DrawChoice( win, dc, rect, flags); }
+
+    virtual void DrawComboBox(wxWindow* win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0)
+        { m_rendererNative.DrawComboBox( win, dc, rect, flags); }
+
+    virtual void DrawTextCtrl(wxWindow* win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0)
+        { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
+
+    virtual void DrawRadioButton(wxWindow* win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags = 0)
+        { m_rendererNative.DrawRadioButton( win, dc, rect, flags); }
+
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
         { return m_rendererNative.GetSplitterParams(win); }
 
@@ -404,7 +458,7 @@ public:
 protected:
     wxRendererNative& m_rendererNative;
 
-    DECLARE_NO_COPY_CLASS(wxDelegateRendererNative)
+    wxDECLARE_NO_COPY_CLASS(wxDelegateRendererNative);
 };
 
 // ----------------------------------------------------------------------------