// Created: 20.07.2003
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License: wxWindows licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
virtual int GetHeaderButtonHeight(wxWindow *win);
+ virtual int GetHeaderButtonMargin(wxWindow *win);
+
// draw the expanded/collapsed icon for a tree control item
virtual void DrawTreeItemButton(wxWindow *win,
const wxRect& rect,
int flags = 0);
- virtual void DrawChoice(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawChoice(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
- virtual void DrawComboBox(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawComboBox(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
- virtual void DrawTextCtrl(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawTextCtrl(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
- virtual void DrawRadioButton(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawRadioBitmap(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
{
GdkWindow* gdk_window = NULL;
-
+
#if wxUSE_GRAPHICS_CONTEXT
if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
gdk_window = win->GTKGetDrawingWindow();
gdk_window = dc.GetGDKWindow();
#endif
}
+
+#if !wxUSE_GRAPHICS_CONTEXT
+ wxUnusedVar(win);
+#endif
+
return gdk_window;
}
gtk_paint_box
(
- button->style,
+ gtk_widget_get_style(button),
gdk_window,
state,
GTK_SHADOW_OUT,
"button",
dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
);
-
+
return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}
int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win))
{
GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
-
+
GtkRequisition req;
GTK_WIDGET_GET_CLASS(button)->size_request(button, &req);
-
+
return req.height;
}
+int wxRendererGTK::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+ wxFAIL_MSG( "GetHeaderButtonMargin() not implemented" );
+ return -1;
+}
+
// draw a ">" or "v" button
void
if (win->GetLayoutDirection() == wxLayout_RightToLeft)
x_diff = rect.width;
- // VZ: I don't know how to get the size of the expander so as to centre it
- // in the given rectangle, +2/3 below is just what looks good here...
+ // x and y parameters specify the center of the expander
gtk_paint_expander
(
- tree->style,
+ gtk_widget_get_style(tree),
gdk_window,
state,
NULL,
tree,
"treeview",
- dc.LogicalToDeviceX(rect.x) + 6 - x_diff,
- dc.LogicalToDeviceY(rect.y) + 3,
+ dc.LogicalToDeviceX(rect.x) + rect.width / 2 - x_diff,
+ dc.LogicalToDeviceY(rect.y) + rect.height / 2,
flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
: GTK_EXPANDER_COLLAPSED
);
wxOrientation orient,
int flags)
{
- if ( !win->m_wxwindow->window )
+ if (gtk_widget_get_window(win->m_wxwindow) == NULL)
{
// window not realized yet
return;
gtk_paint_handle
(
- win->m_wxwindow->style,
+ gtk_widget_get_style(win->m_wxwindow),
gdk_window,
flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
// draw arrow on button
gtk_paint_arrow
(
- button->style,
+ gtk_widget_get_style(button),
gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
else
state = GTK_STATE_NORMAL;
+ GtkShadowType shadow_type;
+
+ if ( flags & wxCONTROL_UNDETERMINED )
+ shadow_type = GTK_SHADOW_ETCHED_IN;
+ else if ( flags & wxCONTROL_CHECKED )
+ shadow_type = GTK_SHADOW_IN;
+ else
+ shadow_type = GTK_SHADOW_OUT;
+
gtk_paint_check
(
- button->style,
+ gtk_widget_get_style(button),
gdk_window,
state,
- flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+ shadow_type,
NULL,
button,
"cellcheck",
gtk_paint_box
(
- button->style,
+ gtk_widget_get_style(button),
gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
button,
"button",
- dc.LogicalToDeviceX(rect.x),
- dc.LogicalToDeviceY(rect.y),
- rect.width,
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
rect.height
);
}
wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") );
- int x_diff = 0;
- if (win->GetLayoutDirection() == wxLayout_RightToLeft)
- x_diff = rect.width;
-
- GtkStateType state;
if (flags & wxCONTROL_SELECTED)
{
+ int x_diff = 0;
+ if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+ x_diff = rect.width;
+
// the wxCONTROL_FOCUSED state is deduced
// directly from the m_wxwindow by GTK+
- state = GTK_STATE_SELECTED;
-
- gtk_paint_flat_box( win->m_widget->style,
+ gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()),
gdk_window,
- state,
+ GTK_STATE_SELECTED,
GTK_SHADOW_NONE,
NULL,
win->m_wxwindow,
rect.width,
rect.height );
}
- else // !wxCONTROL_SELECTED
- {
- state = GTK_STATE_NORMAL;
- }
if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
- {
- gtk_paint_focus( win->m_widget->style,
- gdk_window,
- state,
- NULL,
- win->m_wxwindow,
- // Detail "treeview" causes warning with GTK+ 2.12 Clearlooks theme:
- // "... no property named `row-ending-details'"
- // Using "treeview-middle" would fix the warning, but the right
- // edge of the focus rect is not getting erased properly either.
- // Better to not specify this detail unless the drawing is fixed.
- NULL,
- dc.LogicalToDeviceX(rect.x),
- dc.LogicalToDeviceY(rect.y),
- rect.width,
- rect.height );
- }
+ DrawFocusRect(win, dc, rect, flags);
}
void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
else
state = GTK_STATE_NORMAL;
- gtk_paint_focus( win->m_widget->style,
+ gtk_paint_focus( gtk_widget_get_style(win->m_widget),
gdk_window,
state,
NULL,
GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
-
- if (flags & wxCONTROL_CURRENT )
- GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS );
- else
- GTK_WIDGET_UNSET_FLAGS( entry, GTK_HAS_FOCUS );
+
+ gtk_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0);
gtk_paint_shadow
(
- entry->style,
+ gtk_widget_get_style(entry),
gdk_window,
state,
GTK_SHADOW_OUT,
dc.LogicalToDeviceX(rect.x),
dc.LogicalToDeviceY(rect.y),
rect.width,
- rect.height
+ rect.height
);
}
-// Draw the equivallent of a wxComboBox
+// Draw the equivalent of a wxComboBox
void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{
GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
-
- if (flags & wxCONTROL_CURRENT )
- GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS );
- else
- GTK_WIDGET_UNSET_FLAGS( combo, GTK_HAS_FOCUS );
+
+ gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0);
gtk_paint_shadow
(
- combo->style,
+ gtk_widget_get_style(combo),
gdk_window,
state,
GTK_SHADOW_OUT,
dc.LogicalToDeviceX(rect.x),
dc.LogicalToDeviceY(rect.y),
rect.width,
- rect.height
+ rect.height
);
wxRect r = rect;
gtk_paint_arrow
(
- combo->style,
+ gtk_widget_get_style(combo),
gdk_window,
state,
GTK_SHADOW_OUT,
gtk_paint_box
(
- combo->style,
+ gtk_widget_get_style(combo),
gdk_window,
state,
GTK_SHADOW_ETCHED_OUT,
DrawComboBox( win, dc, rect, flags );
}
-
+
// Draw a themed radio button
-void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{
GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-
+
GtkShadowType shadow_type = GTK_SHADOW_OUT;
if ( flags & wxCONTROL_CHECKED )
shadow_type = GTK_SHADOW_IN;
else if ( flags & wxCONTROL_UNDETERMINED )
shadow_type = GTK_SHADOW_ETCHED_IN;
-
+
GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
gtk_paint_option
(
- button->style,
+ gtk_widget_get_style(button),
gdk_window,
state,
shadow_type,
NULL,
button,
"radiobutton",
- dc.LogicalToDeviceX(rect.x),
- dc.LogicalToDeviceY(rect.y),
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
rect.width, rect.height
);
}
projects / wxWidgets.git / blobdiff