Second part of '[ 1216148 ] cleanup: unused variables and declarations'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-08 14:49:36 +00:00
parent 8fbe65e96d
commit 91af089567
18 changed files with 280 additions and 286 deletions

View File

@@ -42,6 +42,11 @@
#define WXUNUSED_IN_GTK1(arg)
#endif
// RR: After a correction to the orientation of the sash
// this doesn't seem to be required anymore and it
// seems to confuse some themes so USE_ERASE_RECT=0
#define USE_ERASE_RECT 0
// ----------------------------------------------------------------------------
// wxRendererGTK: our wxRendererNative implementation
// ----------------------------------------------------------------------------
@@ -196,7 +201,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
state = GTK_STATE_PRELIGHT;
else
state = GTK_STATE_NORMAL;
// 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...
gtk_paint_expander
@@ -237,7 +242,7 @@ static int GetGtkSplitterFullSize()
gint handle_size;
gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
return handle_size;
#else
return SASH_SIZE + SASH_MARGIN;
@@ -282,14 +287,17 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
// window not realized yet
return;
}
wxCoord full_size = GetGtkSplitterFullSize();
// are we drawing vertical or horizontal splitter?
const bool isVert = orient == wxVERTICAL;
GdkRectangle rect;
#if USE_ERASE_RECT
GdkRectangle erase_rect;
#endif
if ( isVert )
{
int h = win->GetClientSize().GetHeight();
@@ -299,10 +307,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
rect.width = full_size;
rect.height = h;
#if USE_ERASE_RECT
erase_rect.x = position;
erase_rect.y = 0;
erase_rect.width = full_size;
erase_rect.height = h;
#endif
}
else // horz
{
@@ -313,17 +323,15 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
rect.height = full_size;
rect.width = w;
#if USE_ERASE_RECT
erase_rect.y = position;
erase_rect.x = 0;
erase_rect.height = full_size;
erase_rect.width = w;
#endif
}
#if 0
// RR: After a correction to the orientation of the sash
// this doesn't seem to be required anymore and it
// seems to confuse some themes
#if USE_ERASE_RECT
// we must erase everything first, otherwise the garbage
// from the old sash is left when dragging it
gtk_paint_flat_box