make sure we are feeding coordinates of HIView instances, not wx-dimensions back...

[wxWidgets.git] / src / univ / themes / gtk.cpp

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index a721afbb6dfcabadc33e666e11e9704dbc63b00a..e731e6b50e75abf80db271686488c1d04aa5bb1b 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/themes/gtk.cpp
+// Name:        src/univ/themes/gtk.cpp

 // Purpose:     wxUniversal theme implementing GTK-like LNF
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxUniversal theme implementing GTK-like LNF
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -45,13 +45,16 @@
     #include "wx/statusbr.h"
 
     #include "wx/settings.h"
     #include "wx/statusbr.h"
 
     #include "wx/settings.h"

+    #include "wx/toplevel.h"
+    #include "wx/image.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"

-#include "wx/toplevel.h"

 #include "wx/artprov.h"
 #include "wx/artprov.h"

-#include "wx/image.h"
+#ifdef wxUSE_TOGGLEBTN
+#include "wx/tglbtn.h"
+#endif // wxUSE_TOGGLEBTN

 
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"


@@ -163,12 +166,15 @@ public:
                                  wxAlignment align = wxALIGN_LEFT,
                                  int indexAccel = -1);
 
                                  wxAlignment align = wxALIGN_LEFT,
                                  int indexAccel = -1);
 

+#if wxUSE_TOOLBAR

     virtual void DrawToolBarButton(wxDC& dc,
                                    const wxString& label,
                                    const wxBitmap& bitmap,
                                    const wxRect& rect,
                                    int flags = 0,
     virtual void DrawToolBarButton(wxDC& dc,
                                    const wxString& label,
                                    const wxBitmap& bitmap,
                                    const wxRect& rect,
                                    int flags = 0,

-                                   long style = 0);
+                                   long style = 0,
+                                   int tbarStyle = 0);
+#endif // wxUSE_TOOLBAR

 
     virtual void DrawTextLine(wxDC& dc,
                               const wxString& text,
 
     virtual void DrawTextLine(wxDC& dc,
                               const wxString& text,


@@ -185,6 +191,7 @@ public:
                          int flags = 0,
                          int indexAccel = -1);
 
                          int flags = 0,
                          int indexAccel = -1);
 

+#if wxUSE_SLIDER

     virtual void DrawSliderShaft(wxDC& dc,
                                  const wxRect& rect,
                                  int lenThumb,
     virtual void DrawSliderShaft(wxDC& dc,
                                  const wxRect& rect,
                                  int lenThumb,


@@ -209,7 +216,9 @@ public:
     {
         // we don't have the ticks in GTK version
     }
     {
         // we don't have the ticks in GTK version
     }

+#endif // wxUSE_SLIDER

 
 

+#if wxUSE_MENUS

     virtual void DrawMenuBarItem(wxDC& dc,
                                  const wxRect& rect,
                                  const wxString& label,
     virtual void DrawMenuBarItem(wxDC& dc,
                                  const wxRect& rect,
                                  const wxString& label,


@@ -226,11 +235,14 @@ public:
     virtual void DrawMenuSeparator(wxDC& dc,
                                    wxCoord y,
                                    const wxMenuGeometryInfo& geomInfo);
     virtual void DrawMenuSeparator(wxDC& dc,
                                    wxCoord y,
                                    const wxMenuGeometryInfo& geomInfo);

+#endif // wxUSE_MENUS

 
 

+#if wxUSE_STATUSBAR

     virtual void DrawStatusField(wxDC& dc,
                                  const wxRect& rect,
                                  const wxString& label,
                                  int flags = 0, int style = 0);
     virtual void DrawStatusField(wxDC& dc,
                                  const wxRect& rect,
                                  const wxString& label,
                                  int flags = 0, int style = 0);

+#endif // wxUSE_STATUSBAR

 
     virtual void DrawFrameTitleBar(wxDC& dc,
                                    const wxRect& rect,
 
     virtual void DrawFrameTitleBar(wxDC& dc,
                                    const wxRect& rect,


@@ -277,6 +289,7 @@ public:
     // geometry and hit testing
     virtual wxSize GetScrollbarArrowSize() const
         { return m_sizeScrollbarArrow; }
     // geometry and hit testing
     virtual wxSize GetScrollbarArrowSize() const
         { return m_sizeScrollbarArrow; }

+#if wxUSE_SCROLLBAR

     virtual wxRect GetScrollbarRect(const wxScrollBar *scrollbar,
                                     wxScrollBar::Element elem,
                                     int thumbPos = -1) const;
     virtual wxRect GetScrollbarRect(const wxScrollBar *scrollbar,
                                     wxScrollBar::Element elem,
                                     int thumbPos = -1) const;


@@ -286,6 +299,8 @@ public:
     virtual wxCoord ScrollbarToPixel(const wxScrollBar *scrollbar,
                                      int thumbPos = -1);
     virtual int PixelToScrollbar(const wxScrollBar *scrollbar, wxCoord coord);
     virtual wxCoord ScrollbarToPixel(const wxScrollBar *scrollbar,
                                      int thumbPos = -1);
     virtual int PixelToScrollbar(const wxScrollBar *scrollbar, wxCoord coord);

+#endif // wxUSE_SCROLLBAR
+

     virtual wxCoord GetListboxItemHeight(wxCoord fontHeight)
         { return fontHeight + 2; }
     virtual wxSize GetCheckBitmapSize() const
     virtual wxCoord GetListboxItemHeight(wxCoord fontHeight)
         { return fontHeight + 2; }
     virtual wxSize GetCheckBitmapSize() const


@@ -300,15 +315,18 @@ public:
     virtual wxSize GetToolBarMargin() const
         { return wxSize(6, 6); }
 
     virtual wxSize GetToolBarMargin() const
         { return wxSize(6, 6); }
 

+#if wxUSE_TEXTCTRL

     virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
                                     const wxRect& rect) const;
     virtual wxRect GetTextClientArea(const wxTextCtrl *text,
                                      const wxRect& rect,
                                      wxCoord *extraSpaceBeyond) const;
     virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
                                     const wxRect& rect) const;
     virtual wxRect GetTextClientArea(const wxTextCtrl *text,
                                      const wxRect& rect,
                                      wxCoord *extraSpaceBeyond) const;

+#endif // wxUSE_TEXTCTRL

 
     virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
     virtual wxSize GetTabPadding() const { return wxSize(6, 6); }
 
 
     virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
     virtual wxSize GetTabPadding() const { return wxSize(6, 6); }
 

+#if wxUSE_SLIDER

     virtual wxCoord GetSliderDim() const { return 15; }
     virtual wxCoord GetSliderTickLen() const { return 0; }
     virtual wxRect GetSliderShaftRect(const wxRect& rect,
     virtual wxCoord GetSliderDim() const { return 15; }
     virtual wxCoord GetSliderTickLen() const { return 0; }
     virtual wxRect GetSliderShaftRect(const wxRect& rect,


@@ -318,13 +336,19 @@ public:
     virtual wxSize GetSliderThumbSize(const wxRect& rect,
                                       int lenThumb,
                                       wxOrientation orient) const;
     virtual wxSize GetSliderThumbSize(const wxRect& rect,
                                       int lenThumb,
                                       wxOrientation orient) const;

+#endif // wxUSE_SLIDER
+

     virtual wxSize GetProgressBarStep() const { return wxSize(16, 32); }
 
     virtual wxSize GetProgressBarStep() const { return wxSize(16, 32); }
 

+#if wxUSE_MENUS

     virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const;
     virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
                                                 const wxMenu& menu) const;
     virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const;
     virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
                                                 const wxMenu& menu) const;

+#endif // wxUSE_MENUS

 
 

+#if wxUSE_STATUSBAR

     virtual wxSize GetStatusBarBorders(wxCoord *borderBetweenFields) const;
     virtual wxSize GetStatusBarBorders(wxCoord *borderBetweenFields) const;

+#endif // wxUSE_STATUSBAR

 
     // helpers for "wxBitmap wxColourScheme::Get()"
     void DrawCheckBitmap(wxDC& dc, const wxRect& rect);
 
     // helpers for "wxBitmap wxColourScheme::Get()"
     void DrawCheckBitmap(wxDC& dc, const wxRect& rect);


@@ -396,6 +420,7 @@ protected:
     // rect is drawn with DrawAntiShadedRect() and not DrawShadedRect())
     void DrawAntiRaisedBorder(wxDC& dc, wxRect *rect);
 
     // rect is drawn with DrawAntiShadedRect() and not DrawShadedRect())
     void DrawAntiRaisedBorder(wxDC& dc, wxRect *rect);
 

+#if wxUSE_SCROLLBAR

     // returns the size of the arrow for the scrollbar (depends on
     // orientation)
     wxSize GetScrollbarArrowSize(const wxScrollBar *scrollbar) const
     // returns the size of the arrow for the scrollbar (depends on
     // orientation)
     wxSize GetScrollbarArrowSize(const wxScrollBar *scrollbar) const


@@ -413,6 +438,7 @@ protected:
 
         return size;
     }
 
         return size;
     }

+#endif // wxUSE_SCROLLBAR

 
     // get the line wrap indicator bitmap
     wxBitmap GetLineWrapBitmap() const;
 
     // get the line wrap indicator bitmap
     wxBitmap GetLineWrapBitmap() const;


@@ -511,6 +537,8 @@ protected:
     wxGTKRenderer *m_renderer;
 };
 
     wxGTKRenderer *m_renderer;
 };
 

+#if wxUSE_SCROLLBAR
+

 class wxGTKScrollBarInputHandler : public wxStdScrollBarInputHandler
 {
 public:
 class wxGTKScrollBarInputHandler : public wxStdScrollBarInputHandler
 {
 public:


@@ -545,6 +573,10 @@ protected:
     }
 };
 
     }
 };
 

+#endif // wxUSE_SCROLLBAR
+
+#if wxUSE_CHECKBOX
+

 class wxGTKCheckboxInputHandler : public wxStdCheckboxInputHandler
 {
 public:
 class wxGTKCheckboxInputHandler : public wxStdCheckboxInputHandler
 {
 public:


@@ -556,6 +588,10 @@ public:
                            bool pressed);
 };
 
                            bool pressed);
 };
 

+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_TEXTCTRL
+

 class wxGTKTextCtrlInputHandler : public wxStdTextCtrlInputHandler
 {
 public:
 class wxGTKTextCtrlInputHandler : public wxStdTextCtrlInputHandler
 {
 public:


@@ -567,6 +603,8 @@ public:
                            bool pressed);
 };
 
                            bool pressed);
 };
 

+#endif // wxUSE_TEXTCTRL
+

 // ----------------------------------------------------------------------------
 // wxGTKColourScheme: uses the standard GTK colours
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGTKColourScheme: uses the standard GTK colours
 // ----------------------------------------------------------------------------


@@ -701,14 +739,18 @@ wxInputHandler *wxGTKTheme::GetDefaultInputHandler()
 
 wxInputHandler *wxGTKTheme::GetInputHandler(const wxString& control)
 {
 
 wxInputHandler *wxGTKTheme::GetInputHandler(const wxString& control)
 {

-    wxInputHandler *handler;
+    wxInputHandler *handler = NULL;

     int n = m_handlerNames.Index(control);
     if ( n == wxNOT_FOUND )
     {
         // create a new handler
         if ( control == wxINP_HANDLER_SCROLLBAR )
     int n = m_handlerNames.Index(control);
     if ( n == wxNOT_FOUND )
     {
         // create a new handler
         if ( control == wxINP_HANDLER_SCROLLBAR )

+        {
+#if wxUSE_SCROLLBAR

             handler = new wxGTKScrollBarInputHandler(m_renderer,
                                                      GetDefaultInputHandler());
             handler = new wxGTKScrollBarInputHandler(m_renderer,
                                                      GetDefaultInputHandler());

+#endif // wxUSE_SCROLLBAR
+        }

 #if wxUSE_BUTTON
         else if ( control == wxINP_HANDLER_BUTTON )
             handler = new wxStdButtonInputHandler(GetDefaultInputHandler());
 #if wxUSE_BUTTON
         else if ( control == wxINP_HANDLER_BUTTON )
             handler = new wxStdButtonInputHandler(GetDefaultInputHandler());


@@ -751,7 +793,8 @@ wxInputHandler *wxGTKTheme::GetInputHandler(const wxString& control)
 #endif // wxUSE_TOOLBAR
         else if ( control == wxINP_HANDLER_TOPLEVEL )
             handler = new wxStdFrameInputHandler(GetDefaultInputHandler());
 #endif // wxUSE_TOOLBAR
         else if ( control == wxINP_HANDLER_TOPLEVEL )
             handler = new wxStdFrameInputHandler(GetDefaultInputHandler());

-        else
+
+        if(!handler)

             handler = GetDefaultInputHandler();
 
         n = m_handlerNames.Add(control);
             handler = GetDefaultInputHandler();
 
         n = m_handlerNames.Add(control);


@@ -794,9 +837,12 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const
         // and for the states for which we don't have any specific colours
         if ( !col.Ok() || (flags != 0) )
         {
         // and for the states for which we don't have any specific colours
         if ( !col.Ok() || (flags != 0) )
         {

+#if wxUSE_SCROLLBAR

             if ( wxDynamicCast(win, wxScrollBar) )
                 col = Get(SCROLLBAR);
             if ( wxDynamicCast(win, wxScrollBar) )
                 col = Get(SCROLLBAR);

-            else if ( (flags & wxCONTROL_CURRENT) && win->CanBeHighlighted() )
+            else
+#endif //wxUSE_SCROLLBAR
+                 if ( (flags & wxCONTROL_CURRENT) && win->CanBeHighlighted() )

                 col = Get(CONTROL_CURRENT);
             else if ( flags & wxCONTROL_PRESSED )
                 col = Get(CONTROL_PRESSED);
                 col = Get(CONTROL_CURRENT);
             else if ( flags & wxCONTROL_PRESSED )
                 col = Get(CONTROL_PRESSED);


@@ -837,6 +883,14 @@ wxColour wxGTKColourScheme::Get(wxGTKColourScheme::StdColour col) const
 
         case GAUGE:             return Get(CONTROL_CURRENT);
 
 
         case GAUGE:             return Get(CONTROL_CURRENT);
 

+        case TITLEBAR:          return wxColour(0xaeaaae);
+        case TITLEBAR_ACTIVE:   return wxColour(0x820300);
+        case TITLEBAR_TEXT:     return wxColour(0xc0c0c0);
+        case TITLEBAR_ACTIVE_TEXT:
+                                return *wxWHITE;
+
+        case DESKTOP:           return *wxBLACK;
+

         case MAX:
         default:
             wxFAIL_MSG(_T("invalid standard colour"));
         case MAX:
         default:
             wxFAIL_MSG(_T("invalid standard colour"));


@@ -1675,12 +1729,14 @@ void wxGTKRenderer::DrawRadioButton(wxDC& dc,
                              flags, align, indexAccel);
 }
 
                              flags, align, indexAccel);
 }
 

+#if wxUSE_TOOLBAR

 void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
                                       const wxString& label,
                                       const wxBitmap& bitmap,
                                       const wxRect& rectOrig,
                                       int flags,
 void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
                                       const wxString& label,
                                       const wxBitmap& bitmap,
                                       const wxRect& rectOrig,
                                       int flags,

-                                      long WXUNUSED(style))
+                                      long WXUNUSED(style),
+                                      int tbarStyle)

 {
     // we don't draw the separators at all
     if ( !label.empty() || bitmap.Ok() )
 {
     // we don't draw the separators at all
     if ( !label.empty() || bitmap.Ok() )


@@ -1701,14 +1757,33 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
             DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT), rect);
         }
 
             DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT), rect);
         }
 

-        dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE);
+        if(tbarStyle & wxTB_TEXT)
+        {
+            if(tbarStyle & wxTB_HORIZONTAL)
+            {
+                dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE);
+            }
+            else
+            {
+                dc.DrawLabel(label, bitmap, rect, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL);
+            }
+        }
+        else
+        {
+            int xpoint = (rect.GetLeft() + rect.GetRight() + 1 - bitmap.GetWidth()) / 2;
+            int ypoint = (rect.GetTop() + rect.GetBottom() + 1 - bitmap.GetHeight()) / 2;
+            dc.DrawBitmap(bitmap, xpoint, ypoint);
+        }

     }
 }
     }
 }

+#endif // wxUSE_TOOLBAR

 
 // ----------------------------------------------------------------------------
 // text control
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // text control
 // ----------------------------------------------------------------------------
 

+#if wxUSE_TEXTCTRL
+

 wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl * WXUNUSED(text),
                                        const wxRect& rect) const
 {
 wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl * WXUNUSED(text),
                                        const wxRect& rect) const
 {


@@ -1738,6 +1813,8 @@ wxRect wxGTKRenderer::GetTextClientArea(const wxTextCtrl *text,
     return rectText;
 }
 
     return rectText;
 }
 

+#endif // wxUSE_TEXTCTRL
+

 void wxGTKRenderer::DrawTextLine(wxDC& dc,
                                  const wxString& text,
                                  const wxRect& rect,
 void wxGTKRenderer::DrawTextLine(wxDC& dc,
                                  const wxString& text,
                                  const wxRect& rect,


@@ -1862,11 +1939,21 @@ void wxGTKRenderer::DrawTab(wxDC& dc,
         dcMem.SetFont(dc.GetFont());
         dcMem.SetTextForeground(dc.GetTextForeground());
         dcMem.Clear();
         dcMem.SetFont(dc.GetFont());
         dcMem.SetTextForeground(dc.GetTextForeground());
         dcMem.Clear();

-        bitmapRotated = wxBitmap( wxImage( bitmap.ConvertToImage() ).Rotate90(dir==wxLEFT) );
+        bitmapRotated =
+#if wxUSE_IMAGE
+                        wxBitmap( wxImage( bitmap.ConvertToImage() ).Rotate90(dir==wxLEFT) )
+#else
+                        bitmap
+#endif // wxUSE_IMAGE
+                        ;

         dcMem.DrawLabel(label, bitmapRotated, rectLabel, wxALIGN_CENTRE, indexAccel);
         dcMem.SelectObject(wxNullBitmap);
         bitmapMem = bitmapMem.GetSubBitmap(rectLabel);
         dcMem.DrawLabel(label, bitmapRotated, rectLabel, wxALIGN_CENTRE, indexAccel);
         dcMem.SelectObject(wxNullBitmap);
         bitmapMem = bitmapMem.GetSubBitmap(rectLabel);

-        bitmapMem = wxBitmap(wxImage(bitmapMem.ConvertToImage()).Rotate90(dir==wxRIGHT));
+#if wxUSE_IMAGE
+        bitmapMem = wxBitmap(wxImage(bitmapMem.ConvertToImage()).Rotate90(dir==wxRIGHT))
+#endif
+                    ;
+

         dc.DrawBitmap(bitmapMem, rectLabel.y, rectLabel.x, false);
     }
     else
         dc.DrawBitmap(bitmapMem, rectLabel.y, rectLabel.x, false);
     }
     else


@@ -1965,6 +2052,8 @@ void wxGTKRenderer::DrawTab(wxDC& dc,
     }
 }
 
     }
 }
 

+#if wxUSE_SLIDER
+

 // ----------------------------------------------------------------------------
 // slider
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // slider
 // ----------------------------------------------------------------------------


@@ -2054,6 +2143,10 @@ void wxGTKRenderer::DrawSliderThumb(wxDC& dc,
     DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
 }
 
     DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
 }
 

+#endif // wxUSE_SLIDER
+
+#if wxUSE_MENUS
+

 // ----------------------------------------------------------------------------
 // menu and menubar
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // menu and menubar
 // ----------------------------------------------------------------------------


@@ -2319,6 +2412,10 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
     return gi;
 }
 
     return gi;
 }
 

+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+

 // ----------------------------------------------------------------------------
 // status bar
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // status bar
 // ----------------------------------------------------------------------------


@@ -2336,6 +2433,8 @@ void wxGTKRenderer::DrawStatusField(wxDC& WXUNUSED(dc),
 {
 }
 
 {
 }
 

+#endif // wxUSE_STATUSBAR
+

 // ----------------------------------------------------------------------------
 // combobox
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // combobox
 // ----------------------------------------------------------------------------


@@ -2759,6 +2858,7 @@ void wxGTKRenderer::DrawScrollCorner(wxDC& dc, const wxRect& rect)
     DoDrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL), rect);
 }
 
     DoDrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL), rect);
 }
 

+#if wxUSE_SCROLLBAR

 wxRect wxGTKRenderer::GetScrollbarRect(const wxScrollBar *scrollbar,
                                        wxScrollBar::Element elem,
                                        int thumbPos) const
 wxRect wxGTKRenderer::GetScrollbarRect(const wxScrollBar *scrollbar,
                                        wxScrollBar::Element elem,
                                        int thumbPos) const


@@ -2801,6 +2901,7 @@ int wxGTKRenderer::PixelToScrollbar(const wxScrollBar *scrollbar,
     return StandardPixelToScrollbar(scrollbar, coord,
                                     GetScrollbarArrowSize(scrollbar));
 }
     return StandardPixelToScrollbar(scrollbar, coord,
                                     GetScrollbarArrowSize(scrollbar));
 }

+#endif // wxUSE_SCROLLBAR

 
 // ----------------------------------------------------------------------------
 // size adjustments
 
 // ----------------------------------------------------------------------------
 // size adjustments


@@ -2815,8 +2916,15 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
         size->y += 4;
     } else
 #endif // wxUSE_BMPBUTTON
         size->y += 4;
     } else
 #endif // wxUSE_BMPBUTTON

-#if wxUSE_BUTTON
-    if ( wxDynamicCast(window, wxButton) )
+#if wxUSE_BUTTON || wxUSE_TOGGLEBTN
+    if ( 0
+#  if wxUSE_BUTTON
+         || wxDynamicCast(window, wxButton)
+#  endif // wxUSE_BUTTON
+#  if wxUSE_TOGGLEBTN
+         || wxDynamicCast(window, wxToggleButton)
+#  endif // wxUSE_TOGGLEBTN
+        )

     {
         if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) )
         {
     {
         if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) )
         {


@@ -2830,7 +2938,8 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
             size->y += 4;
         }
     } else
             size->y += 4;
         }
     } else

-#endif //wxUSE_BUTTON
+#endif // wxUSE_BUTTON || wxUSE_TOGGLEBTN
+#if wxUSE_SCROLLBAR

     if ( wxDynamicCast(window, wxScrollBar) )
     {
         // we only set the width of vert scrollbars and height of the
     if ( wxDynamicCast(window, wxScrollBar) )
     {
         // we only set the width of vert scrollbars and height of the


@@ -2841,6 +2950,7 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
             size->x = m_sizeScrollbarArrow.x;
     }
     else
             size->x = m_sizeScrollbarArrow.x;
     }
     else

+#endif // wxUSE_SCROLLBAR

     {
         // take into account the border width
         wxRect rectBorder = GetBorderDimensions(window->GetBorder());
     {
         // take into account the border width
         wxRect rectBorder = GetBorderDimensions(window->GetBorder());


@@ -3266,6 +3376,8 @@ bool wxGTKInputHandler::HandleMouseMove(wxInputConsumer *control,
     return true;
 }
 
     return true;
 }
 

+#if wxUSE_CHECKBOX
+

 // ----------------------------------------------------------------------------
 // wxGTKCheckboxInputHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGTKCheckboxInputHandler
 // ----------------------------------------------------------------------------


@@ -3288,6 +3400,10 @@ bool wxGTKCheckboxInputHandler::HandleKey(wxInputConsumer *control,
     return false;
 }
 
     return false;
 }
 

+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_TEXTCTRL
+

 // ----------------------------------------------------------------------------
 // wxGTKTextCtrlInputHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGTKTextCtrlInputHandler
 // ----------------------------------------------------------------------------


@@ -3381,3 +3497,5 @@ bool wxGTKTextCtrlInputHandler::HandleKey(wxInputConsumer *control,
 
     return wxStdTextCtrlInputHandler::HandleKey(control, event, pressed);
 }
 
     return wxStdTextCtrlInputHandler::HandleKey(control, event, pressed);
 }

+
+#endif // wxUSE_TEXTCTRL