#include "wx/dcmemory.h"
#include "wx/window.h"
+ #include "wx/bmpbuttn.h"
#include "wx/button.h"
#include "wx/checkbox.h"
#include "wx/listbox.h"
// we don't have the ticks in GTK version
}
+#if wxUSE_MENUS
virtual void DrawMenuBarItem(wxDC& dc,
const wxRect& rect,
const wxString& label,
virtual void DrawMenuSeparator(wxDC& dc,
wxCoord y,
const wxMenuGeometryInfo& geomInfo);
-
+#endif
virtual void GetComboBitmaps(wxBitmap *bmpNormal,
+ wxBitmap *bmpFocus,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled);
virtual wxSize GetSliderThumbSize(const wxRect& rect,
wxOrientation orient) const;
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;
-
+#endif
// helpers for "wxBitmap wxColourScheme::Get()"
void DrawCheckBitmap(wxDC& dc, const wxRect& rect);
void DrawUncheckBitmap(wxDC& dc, const wxRect& rect, bool isPressed);
wxAlignment align,
int indexAccel);
+ // initialize the combo bitmaps
+ void InitComboBitmaps();
+
private:
const wxColourScheme *m_scheme;
// the line wrap bitmap (drawn at the end of wrapped lines)
wxBitmap m_bmpLineWrap;
+
+ // the combobox bitmaps
+ enum
+ {
+ ComboState_Normal,
+ ComboState_Focus,
+ ComboState_Pressed,
+ ComboState_Disabled,
+ ComboState_Max
+ };
+
+ wxBitmap m_bitmapsCombo[ComboState_Max];
};
// ----------------------------------------------------------------------------
break;
case wxBORDER_STATIC:
- DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+ for ( width = 0; width < BORDER_THICKNESS; width++ )
+ {
+ DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+ }
break;
case wxBORDER_RAISED:
break;
case wxBORDER_DOUBLE:
- DrawShadedRect(dc, &rect, m_penLightGrey, m_penBlack);
- DrawShadedRect(dc, &rect, m_penHighlight, m_penDarkGrey);
- DrawRect(dc, &rect, m_penLightGrey);
+ for ( width = 0; width < BORDER_THICKNESS; width++ )
+ {
+ DrawShadedRect(dc, &rect, m_penLightGrey, m_penBlack);
+ DrawShadedRect(dc, &rect, m_penHighlight, m_penDarkGrey);
+ DrawRect(dc, &rect, m_penLightGrey);
+ }
break;
case wxBORDER_SIMPLE:
- DrawRect(dc, &rect, m_penBlack);
+ for ( width = 0; width < BORDER_THICKNESS; width++ )
+ {
+ DrawRect(dc, &rect, m_penBlack);
+ }
break;
default:
case wxBORDER_SIMPLE:
case wxBORDER_STATIC:
- width = 1;
+ width = BORDER_THICKNESS;
break;
case wxBORDER_DOUBLE:
- width = 3;
+ width = 3*BORDER_THICKNESS;
break;
default:
{
wxRect rect = rectOrig;
- if ( flags & wxCONTROL_FOCUSED )
- {
- DrawRect(dc, &rect, m_penBlack);
- DrawAntiShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
- }
- else // !focused
+ if ( border != wxBORDER_NONE )
{
- DrawAntiShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
- DrawAntiShadedRect(dc, &rect, m_penBlack, m_penHighlight);
+ if ( flags & wxCONTROL_FOCUSED )
+ {
+ DrawRect(dc, &rect, m_penBlack);
+ DrawAntiShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+ }
+ else // !focused
+ {
+ DrawAntiShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+ DrawAntiShadedRect(dc, &rect, m_penBlack, m_penHighlight);
+ }
}
if ( rectIn )
{
// button pressed: draw a black border around it and an inward shade
DrawRect(dc, &rect, m_penBlack);
- DrawAntiShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
- DrawAntiShadedRect(dc, &rect, m_penBlack, m_penDarkGrey);
+
+ for ( size_t width = 0; width < BORDER_THICKNESS; width++ )
+ {
+ DrawAntiShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+ DrawAntiShadedRect(dc, &rect, m_penBlack, m_penDarkGrey);
+ }
}
else
{
}
// now draw a normal button
- DrawShadedRect(dc, &rect, m_penHighlight, m_penBlack);
- DrawAntiShadedRect(dc, &rect,
- wxPen(GetBackgroundColour(flags), 0, wxSOLID),
- m_penDarkGrey);
+ for ( size_t width = 0; width < BORDER_THICKNESS; width++ )
+ {
+ DrawShadedRect(dc, &rect, m_penHighlight, m_penBlack);
+ DrawAntiShadedRect(dc, &rect,
+ wxPen(GetBackgroundColour(flags), 0, wxSOLID),
+ m_penDarkGrey);
+ }
}
if ( rectIn )
// text control
// ----------------------------------------------------------------------------
-static const int TEXT_BORDER = 2;
-
wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl *text,
const wxRect& rect)
{
wxRect rectTotal = rect;
- rectTotal.Inflate(TEXT_BORDER);
+ rectTotal.Inflate(2*BORDER_THICKNESS);
return rectTotal;
}
wxCoord *extraSpaceBeyond)
{
wxRect rectText = rect;
- rectText.Inflate(-TEXT_BORDER);
+ rectText.Inflate(-2*BORDER_THICKNESS);
if ( text->WrapLines() )
{
DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
}
+#if wxUSE_MENUS
// ----------------------------------------------------------------------------
// menu and menubar
// ----------------------------------------------------------------------------
return NULL;
}
+#endif // wxUSE_MENUS
// ----------------------------------------------------------------------------
// combobox
// ----------------------------------------------------------------------------
+void wxGTKRenderer::InitComboBitmaps()
+{
+ wxSize sizeArrow = m_sizeScrollbarArrow;
+ sizeArrow.x -= 2;
+ sizeArrow.y -= 2;
+
+ size_t n;
+
+ for ( n = ComboState_Normal; n < ComboState_Max; n++ )
+ {
+ m_bitmapsCombo[n].Create(sizeArrow.x, sizeArrow.y);
+ }
+
+ static const int comboButtonFlags[ComboState_Max] =
+ {
+ 0,
+ wxCONTROL_CURRENT,
+ wxCONTROL_PRESSED,
+ wxCONTROL_DISABLED,
+ };
+
+ wxRect rect(wxPoint(0, 0), sizeArrow);
+
+ wxMemoryDC dc;
+ for ( n = ComboState_Normal; n < ComboState_Max; n++ )
+ {
+ int flags = comboButtonFlags[n];
+
+ dc.SelectObject(m_bitmapsCombo[n]);
+ DoDrawBackground(dc, GetBackgroundColour(flags), rect);
+ DrawArrow(dc, wxDOWN, rect, flags);
+ }
+}
+
void wxGTKRenderer::GetComboBitmaps(wxBitmap *bmpNormal,
+ wxBitmap *bmpFocus,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled)
{
- // TODO
+ if ( !m_bitmapsCombo[ComboState_Normal].Ok() )
+ {
+ InitComboBitmaps();
+ }
+
+ if ( bmpNormal )
+ *bmpNormal = m_bitmapsCombo[ComboState_Normal];
+ if ( bmpFocus )
+ *bmpFocus = m_bitmapsCombo[ComboState_Focus];
+ if ( bmpPressed )
+ *bmpPressed = m_bitmapsCombo[ComboState_Pressed];
+ if ( bmpDisabled )
+ *bmpDisabled = m_bitmapsCombo[ComboState_Disabled];
}
// ----------------------------------------------------------------------------
void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
{
- if ( wxDynamicCast(window, wxButton) )
+#if wxUSE_BMPBUTTON
+ if ( wxDynamicCast(window, wxBitmapButton) )
{
- // TODO: this is ad hoc...
- size->x += 3*window->GetCharWidth();
- if ( size->x < 80 )
- size->x = 80;
- wxCoord minBtnHeight = 22;
- if ( size->y < minBtnHeight )
- size->y = minBtnHeight;
-
- // button border width
+ size->x += 4;
size->y += 4;
- }
- else if ( wxDynamicCast(window, wxScrollBar) )
+ } else
+#endif // wxUSE_BMPBUTTON
+#if wxUSE_BUTTON
+ if ( wxDynamicCast(window, wxButton) )
+ {
+ if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) )
+ {
+ // TODO: this is ad hoc...
+ size->x += 3*window->GetCharWidth();
+ wxCoord minBtnHeight = 18;
+ if ( size->y < minBtnHeight )
+ size->y = minBtnHeight;
+
+ // button border width
+ size->y += 4;
+ }
+ } else
+#endif wxUSE_BUTTON
+ if ( wxDynamicCast(window, wxScrollBar) )
{
// we only set the width of vert scrollbars and height of the
// horizontal ones
const wxMouseEvent& event)
{
// clicking on the control gives it focus
- if ( event.ButtonDown() )
+ if ( event.ButtonDown() && wxWindow::FindFocus() != control )
{
control->SetFocus();
projects / wxWidgets.git / blobdiff