Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More attempts to better support theme borders

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-11-09 20:57:39 +00:00
parent 8b71ebada4
commit 6de67633bd
4 changed files with 103 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/win_gtk.cpp
View File

@@ -9,6 +9,7 @@
#include "wx/defs.h"
#include "wx/gtk/win_gtk.h"
#include "gtk/gtk.h"
/*
wxPizza is a custom GTK+ widget derived from GtkFixed. A custom widget
@@ -166,6 +167,9 @@ static void realize(GtkWidget* widget)
else
gdk_window_reparent(widget->window, pizza->m_backing_window, border_x, border_y);
gdk_window_resize(widget->window, w, h);
widget->style = gtk_style_attach (widget->style, pizza->m_backing_window);
gtk_style_set_background (widget->style, pizza->m_backing_window, GTK_STATE_NORMAL);
}
}
@@ -356,6 +360,8 @@ void wxPizza::scroll(int dx, int dy)
}
}
extern GtkWidget *GetEntryWidget();
void wxPizza::get_border_widths(int& x, int& y)
{
x = y = 0;
@@ -363,13 +369,11 @@ void wxPizza::get_border_widths(int& x, int& y)
x = y = 1;
else if (m_border_style)
{
GtkWidget* widget = GTK_WIDGET(this);
if (widget->style)
GtkWidget *entry_widget = GetEntryWidget();
if (entry_widget->style)
{
x = widget->style->xthickness;
y = widget->style->ythickness;
x = 1;
y = 1;
x = entry_widget->style->xthickness;
y = entry_widget->style->ythickness;
}
}
}