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

Use InheritAttributes for wxGTK widgets so they will check

Browse Source 
ShouldInheritColours.  Set wxButton to not inherit colours.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-12-03 03:24:47 +00:00
parent cc6dd35581
commit e8e24dfa93
33 changed files with 55 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/button.h
View File

@ -60,6 +60,11 @@ public:
// on its panel
virtual void SetDefault() { }
// Buttons on MSW can look bad if they are not native colours, because
// then they become owner-drawn and not theme-drawn. Disable it here
// in wxButtonBase to make it consistent.
virtual bool ShouldInheritColours() const { return false; }
// returns the default button size for this platform
static wxSize GetDefaultSize();

4
include/wx/gtk/button.h
View File

@ -67,6 +67,10 @@ public:
void ApplyWidgetStyle();
bool IsOwnGtkWindow( GdkWindow *window );
// Since this wxButton doesn't derive from wxButtonBase (why?) we need
// to override this here too...
virtual bool ShouldInheritColours() const { return false; }
protected:
virtual wxSize DoGetBestSize() const;

4
include/wx/gtk1/button.h
View File

@ -67,6 +67,10 @@ public:
void ApplyWidgetStyle();
bool IsOwnGtkWindow( GdkWindow *window );
// Since this wxButton doesn't derive from wxButtonBase (why?) we need
// to override this here too...
virtual bool ShouldInheritColours() const { return false; }
protected:
virtual wxSize DoGetBestSize() const;

3
src/gtk/bmpbuttn.cpp
View File

@ -176,8 +176,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
InheritAttributes();
Show( TRUE );

6
src/gtk/button.cpp
View File

@ -136,8 +136,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize best_size( DoGetBestSize() );
wxSize new_size( size );
@ -150,9 +149,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetSize( new_size );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

6
src/gtk/checkbox.cpp
View File

@ -121,8 +121,7 @@ bool wxCheckBox::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
@ -133,9 +132,6 @@ bool wxCheckBox::Create(wxWindow *parent,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

6
src/gtk/choice.cpp
View File

@ -111,14 +111,10 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
SetBestSize(size);
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

4
src/gtk/combobox.cpp
View File

@ -158,6 +158,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
m_focusWidget = combo->entry;
PostCreation();
InheritAttributes();
ConnectWidget( combo->button );
@ -190,9 +191,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
}
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

5
src/gtk/listbox.cpp
View File

@ -399,10 +399,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
InheritAttributes();
Show( TRUE );

4
src/gtk/radiobox.cpp
View File

@ -231,6 +231,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
m_parent->DoAddChild( this );
PostCreation();
InheritAttributes();
ApplyWidgetStyle();
@ -251,9 +252,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
if (newSize.y == -1) newSize.y = ls.y;
SetSize( newSize.x, newSize.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

6
src/gtk/radiobut.cpp
View File

@ -129,8 +129,7 @@ bool wxRadioButton::Create( wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
@ -141,9 +140,6 @@ bool wxRadioButton::Create( wxWindow *parent,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

3
src/gtk/scrolbar.cpp
View File

@ -180,11 +180,10 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
InheritAttributes();
SetBestSize(size);
SetBackgroundColour( parent->GetBackgroundColour() );
Show( TRUE );
return TRUE;

3
src/gtk/slider.cpp
View File

@ -142,8 +142,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
InheritAttributes();
Show( TRUE );

3
src/gtk/spinbutt.cpp
View File

@ -151,8 +151,7 @@ bool wxSpinButton::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
InheritAttributes();
Show( TRUE );

5
src/gtk/spinctrl.cpp
View File

@ -127,9 +127,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
InheritAttributes();
SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
if (new_size.x == -1)
@ -141,8 +140,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetValue( value );
Show( TRUE );

10
src/gtk/stattext.cpp
View File

@ -111,7 +111,8 @@ bool wxStaticText::Create(wxWindow *parent,
ApplyWidgetStyle();
wxControl::SetFont( parent->GetFont() );
InheritAttributes();
// wxControl::SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
@ -122,8 +123,11 @@ bool wxStaticText::Create(wxWindow *parent,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
// if (ShouldInheritColours())
// {
// SetBackgroundColour( parent->GetBackgroundColour() );
// SetForegroundColour( parent->GetForegroundColour() );
// }
Show( TRUE );
return TRUE;

3
src/gtk/textctrl.cpp
View File

@ -347,8 +347,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
m_focusWidget = m_text;
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );

6
src/gtk/tglbtn.cpp
View File

@ -75,8 +75,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild(this);
PostCreation();
SetFont(parent->GetFont());
InheritAttributes();
wxSize size_best(DoGetBestSize());
wxSize new_size(size);
@ -87,9 +86,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize(new_size.x, new_size.y);
SetBackgroundColour(parent->GetBackgroundColour());
SetForegroundColour(parent->GetForegroundColour());
Show(TRUE);
return TRUE;

3
src/gtk1/bmpbuttn.cpp
View File

@ -176,8 +176,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
InheritAttributes();
Show( TRUE );

6
src/gtk1/button.cpp
View File

@ -136,8 +136,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize best_size( DoGetBestSize() );
wxSize new_size( size );
@ -150,9 +149,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetSize( new_size );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

6
src/gtk1/checkbox.cpp
View File

@ -121,8 +121,7 @@ bool wxCheckBox::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
@ -133,9 +132,6 @@ bool wxCheckBox::Create(wxWindow *parent,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

6
src/gtk1/choice.cpp
View File

@ -111,14 +111,10 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
SetBestSize(size);
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

4
src/gtk1/combobox.cpp
View File

@ -158,6 +158,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
m_focusWidget = combo->entry;
PostCreation();
InheritAttributes();
ConnectWidget( combo->button );
@ -190,9 +191,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
}
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

5
src/gtk1/listbox.cpp
View File

@ -399,10 +399,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
InheritAttributes();
Show( TRUE );

4
src/gtk1/radiobox.cpp
View File

@ -231,6 +231,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
m_parent->DoAddChild( this );
PostCreation();
InheritAttributes();
ApplyWidgetStyle();
@ -251,9 +252,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
if (newSize.y == -1) newSize.y = ls.y;
SetSize( newSize.x, newSize.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

6
src/gtk1/radiobut.cpp
View File

@ -129,8 +129,7 @@ bool wxRadioButton::Create( wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
@ -141,9 +140,6 @@ bool wxRadioButton::Create( wxWindow *parent,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;

3
src/gtk1/scrolbar.cpp
View File

@ -180,11 +180,10 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
InheritAttributes();
SetBestSize(size);
SetBackgroundColour( parent->GetBackgroundColour() );
Show( TRUE );
return TRUE;

3
src/gtk1/slider.cpp
View File

@ -142,8 +142,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
InheritAttributes();
Show( TRUE );

3
src/gtk1/spinbutt.cpp
View File

@ -151,8 +151,7 @@ bool wxSpinButton::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
InheritAttributes();
Show( TRUE );

5
src/gtk1/spinctrl.cpp
View File

@ -127,9 +127,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation();
InheritAttributes();
SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
if (new_size.x == -1)
@ -141,8 +140,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetValue( value );
Show( TRUE );

10
src/gtk1/stattext.cpp
View File

@ -111,7 +111,8 @@ bool wxStaticText::Create(wxWindow *parent,
ApplyWidgetStyle();
wxControl::SetFont( parent->GetFont() );
InheritAttributes();
// wxControl::SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
@ -122,8 +123,11 @@ bool wxStaticText::Create(wxWindow *parent,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
// if (ShouldInheritColours())
// {
// SetBackgroundColour( parent->GetBackgroundColour() );
// SetForegroundColour( parent->GetForegroundColour() );
// }
Show( TRUE );
return TRUE;

3
src/gtk1/textctrl.cpp
View File

@ -347,8 +347,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
m_focusWidget = m_text;
PostCreation();
SetFont( parent->GetFont() );
InheritAttributes();
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );

6
src/gtk1/tglbtn.cpp
View File

@ -75,8 +75,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild(this);
PostCreation();
SetFont(parent->GetFont());
InheritAttributes();
wxSize size_best(DoGetBestSize());
wxSize new_size(size);
@ -87,9 +86,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize(new_size.x, new_size.y);
SetBackgroundColour(parent->GetBackgroundColour());
SetForegroundColour(parent->GetForegroundColour());
Show(TRUE);
return TRUE;