summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-05-31 12:14:01 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-05-31 12:14:01 +0100
commite67fc823516226a41319ee242fefda245fb18a3e (patch)
treeb9b82827d37f42dbc2e21344fbc4fb8b2cccbb29 /vcl/unx/gtk
parent7c610c7daca12f631845ddbaf01c52029ef97da3 (diff)
vcl: cleanup code flow, and minor indent tweak
Change-Id: Id99b10f84ef977f5c808fb2c9168deaa4455a2a9
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx47
1 files changed, 23 insertions, 24 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index a8a849f86ac5..9d9dee67b29b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1140,25 +1140,25 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType,
sal_Bool GtkSalGraphics::NWPaintGTKWindowBackground(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
- const Rectangle& rControlRectangle,
+ const Rectangle& /* rControlRectangle */,
const clipList& rClipList,
- ControlState nState, const ImplControlValue&,
+ ControlState /* nState */, const ImplControlValue&,
const OUString& )
{
- int w,h;
- gtk_window_get_size(GTK_WINDOW(m_pWindow),&w,&h);
- GdkRectangle clipRect;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
- {
- clipRect.x = it->Left();
- clipRect.y = it->Top();
- clipRect.width = it->GetWidth();
- clipRect.height = it->GetHeight();
+ int w,h;
+ gtk_window_get_size(GTK_WINDOW(m_pWindow),&w,&h);
+ GdkRectangle clipRect;
+ for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ {
+ clipRect.x = it->Left();
+ clipRect.y = it->Top();
+ clipRect.width = it->GetWidth();
+ clipRect.height = it->GetHeight();
- gtk_paint_flat_box(m_pWindow->style,gdkDrawable,GTK_STATE_NORMAL,GTK_SHADOW_NONE,&clipRect,m_pWindow,"base",0,0,w,h);
- }
+ gtk_paint_flat_box(m_pWindow->style,gdkDrawable,GTK_STATE_NORMAL,GTK_SHADOW_NONE,&clipRect,m_pWindow,"base",0,0,w,h);
+ }
- return sal_True;
+ return sal_True;
}
sal_Bool GtkSalGraphics::NWPaintGTKButtonReal(
@@ -1281,18 +1281,17 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal(
&clipRect, m_pWindow, "base", x, y, w, h );
}
- if ( (nState & CTRL_STATE_DEFAULT) && GTK_IS_BUTTON(button) )
- {
- gtk_paint_box( button->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
- &clipRect, button, "buttondefault", x, y, w, h );
- }
- /* don't draw "button", because it can be a tool_button, and
- * it causes some weird things, so, the default button is
- * just fine */
- if(GTK_IS_BUTTON(button))
+ if ( GTK_IS_BUTTON(button) )
{
+ if ( (nState & CTRL_STATE_DEFAULT) )
+ gtk_paint_box( button->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+ &clipRect, button, "buttondefault", x, y, w, h );
+
+ /* don't draw "button", because it can be a tool_button, and
+ * it causes some weird things, so, the default button is
+ * just fine */
gtk_paint_box( button->style, gdkDrawable, stateType, shadowType,
- &clipRect, button, "button", xi, yi, wi, hi );
+ &clipRect, button, "button", xi, yi, wi, hi );
}
}