AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bunch of GTK theme changes.

Browse Source 
Make wxStatusBar use themes.
  SetStatusText() now uses Refresh() since I don't
    know why it shouldn't.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2002-04-21 16:43:15 +00:00
parent c7de4135b6
commit f90566f5c3
5 changed files with 87 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/generic/statusbr.cpp
View File

@ -85,6 +85,9 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
wxDefaultPosition, wxDefaultSize,
style | wxTAB_TRAVERSAL, name);
// The status bar should have a themed background
SetThemeEnabled( TRUE );
// Don't wish this to be found as a child
#ifndef __WXMAC__
parent->GetChildren().DeleteObject(this);
@ -127,27 +130,10 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
m_statusStrings[number] = text;
#ifdef __WXMAC__
int major,minor;
wxGetOsVersion( &major, &minor );
if (major >= 10)
{
Refresh();
return;
}
#endif
wxRect rect;
GetFieldRect(number, rect);
wxClientDC dc(this);
dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
dc.Clear();
dc.DestroyClippingRegion();
dc.SetFont(GetFont());
DrawFieldText( dc, number );
Refresh( TRUE, &rect );
}
wxString wxStatusBarGeneric::GetStatusText(int n) const

4
src/gtk/dcclient.cpp
View File

@ -1569,9 +1569,7 @@ void wxWindowDC::Clear()
if (m_owner)
{
int width,height;
m_owner->GetSize( &width, &height );
gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
m_owner->Clear();
return;
}

80
src/gtk/window.cpp
View File

@ -3467,8 +3467,43 @@ void wxWindowGTK::GtkSendPaintEvents()
return;
}
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
// Clip to paint region in wxClientDC
m_clipPaintRegion = TRUE;
if (GetThemeEnabled())
{
// find ancestor from which to steal background
wxWindow *parent = GetParent();
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (!parent)
parent = this;
wxRegionIterator upd( m_updateRegion );
while (upd)
{
GdkRectangle rect;
rect.x = upd.GetX();
rect.y = upd.GetY();
rect.width = upd.GetWidth();
rect.height = upd.GetHeight();
gtk_paint_flat_box( parent->m_widget->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
&rect,
parent->m_widget,
(char *)"base",
0, 0, -1, -1 );
upd ++;
}
}
else
// if (!m_clearRegion.IsEmpty()) // always send an erase event
{
wxWindowDC dc( (wxWindow*)this );
@ -3481,46 +3516,16 @@ void wxWindowGTK::GtkSendPaintEvents()
{
if (!g_eraseGC)
{
g_eraseGC = gdk_gc_new( GTK_PIZZA(m_wxwindow)->bin_window );
g_eraseGC = gdk_gc_new( pizza->bin_window );
gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
}
gdk_gc_set_foreground( g_eraseGC, m_backgroundColour.GetColor() );
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
// find ancestor from which to steal background
wxWindow *parent = GetParent();
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (!parent)
parent = this;
wxRegionIterator upd( m_clearRegion );
while (upd)
{
if (GetThemeEnabled())
{
GdkRectangle rect;
rect.x = upd.GetX();
rect.y = upd.GetY();
rect.width = upd.GetWidth();
rect.height = upd.GetHeight();
gtk_paint_flat_box( parent->m_widget->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
&rect,
parent->m_widget,
(char *)"base",
0, 0, -1, -1 );
}
else
{
gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
}
gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
upd ++;
}
}
@ -3543,8 +3548,6 @@ void wxWindowGTK::GtkSendPaintEvents()
// being redrawn because the wxWindows class is allowed to
// paint over the window-less widgets.
GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
GList *children = pizza->children;
while (children)
{
@ -3629,12 +3632,9 @@ void wxWindowGTK::GtkSetBackgroundColour( const wxColour &colour )
// We need the pixel value e.g. for background clearing.
m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
if ((m_wxwindow) &&
(m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)))
if (m_wxwindow)
{
/* wxMSW doesn't clear the window here. I don't do that either to
provide compatibility. call Clear() to do the job. */
// wxMSW doesn't clear the window here, either.
gdk_window_set_background( window, m_backgroundColour.GetColor() );
}

4
src/gtk1/dcclient.cpp
View File

@ -1569,9 +1569,7 @@ void wxWindowDC::Clear()
if (m_owner)
{
int width,height;
m_owner->GetSize( &width, &height );
gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
m_owner->Clear();
return;
}

80
src/gtk1/window.cpp
View File

@ -3467,8 +3467,43 @@ void wxWindowGTK::GtkSendPaintEvents()
return;
}
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
// Clip to paint region in wxClientDC
m_clipPaintRegion = TRUE;
if (GetThemeEnabled())
{
// find ancestor from which to steal background
wxWindow *parent = GetParent();
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (!parent)
parent = this;
wxRegionIterator upd( m_updateRegion );
while (upd)
{
GdkRectangle rect;
rect.x = upd.GetX();
rect.y = upd.GetY();
rect.width = upd.GetWidth();
rect.height = upd.GetHeight();
gtk_paint_flat_box( parent->m_widget->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
&rect,
parent->m_widget,
(char *)"base",
0, 0, -1, -1 );
upd ++;
}
}
else
// if (!m_clearRegion.IsEmpty()) // always send an erase event
{
wxWindowDC dc( (wxWindow*)this );
@ -3481,46 +3516,16 @@ void wxWindowGTK::GtkSendPaintEvents()
{
if (!g_eraseGC)
{
g_eraseGC = gdk_gc_new( GTK_PIZZA(m_wxwindow)->bin_window );
g_eraseGC = gdk_gc_new( pizza->bin_window );
gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
}
gdk_gc_set_foreground( g_eraseGC, m_backgroundColour.GetColor() );
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
// find ancestor from which to steal background
wxWindow *parent = GetParent();
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (!parent)
parent = this;
wxRegionIterator upd( m_clearRegion );
while (upd)
{
if (GetThemeEnabled())
{
GdkRectangle rect;
rect.x = upd.GetX();
rect.y = upd.GetY();
rect.width = upd.GetWidth();
rect.height = upd.GetHeight();
gtk_paint_flat_box( parent->m_widget->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
&rect,
parent->m_widget,
(char *)"base",
0, 0, -1, -1 );
}
else
{
gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
}
gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
upd ++;
}
}
@ -3543,8 +3548,6 @@ void wxWindowGTK::GtkSendPaintEvents()
// being redrawn because the wxWindows class is allowed to
// paint over the window-less widgets.
GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
GList *children = pizza->children;
while (children)
{
@ -3629,12 +3632,9 @@ void wxWindowGTK::GtkSetBackgroundColour( const wxColour &colour )
// We need the pixel value e.g. for background clearing.
m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
if ((m_wxwindow) &&
(m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)))
if (m_wxwindow)
{
/* wxMSW doesn't clear the window here. I don't do that either to
provide compatibility. call Clear() to do the job. */
// wxMSW doesn't clear the window here, either.
gdk_window_set_background( window, m_backgroundColour.GetColor() );
}