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

Take account of wxBORDER_THEME (assume it's like wxBORDER_SUNKEN)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-13 14:34:28 +00:00
parent e50488546a
commit dbb6177963
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk1/window.cpp
View File

@@ -371,7 +371,7 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
return; return;
} }
if (win->HasFlag(wxSUNKEN_BORDER)) if (win->HasFlag(wxSUNKEN_BORDER) || win->HasFlag(wxBORDER_THEME))
{ {
gtk_draw_shadow( widget->style, gtk_draw_shadow( widget->style,
widget->window, widget->window,
@@ -2495,6 +2495,11 @@ bool wxWindowGTK::Create( wxWindow *parent,
long style, long style,
const wxString &name ) const wxString &name )
{ {
// Get default border
wxBorder border = GetBorder(style);
style &= ~wxBORDER_MASK;
style |= border;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{ {
@@ -2526,7 +2531,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
{ {
gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_OUT ); gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_OUT );
} }
else if (HasFlag(wxSUNKEN_BORDER)) else if (HasFlag(wxSUNKEN_BORDER) || HasFlag(wxBORDER_THEME))
{ {
gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_IN ); gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_IN );
} }
@@ -2989,7 +2994,7 @@ void wxWindowGTK::DoSetClientSize( int width, int height )
int dh = 0; int dh = 0;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER)) if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxBORDER_THEME))
{ {
/* when using GTK 1.2 we set the shadow border size to 2 */ /* when using GTK 1.2 we set the shadow border size to 2 */
dw += 2 * 2; dw += 2 * 2;
@@ -3053,7 +3058,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
int dh = 0; int dh = 0;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER)) if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxBORDER_THEME))
{ {
/* when using GTK 1.2 we set the shadow border size to 2 */ /* when using GTK 1.2 we set the shadow border size to 2 */
dw += 2 * 2; dw += 2 * 2;