More GTK prefixing for internal methods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-02-13 10:25:38 +00:00
parent 7fc8b9a4fe
commit 496e7ec647
11 changed files with 24 additions and 24 deletions

View File

@@ -213,7 +213,7 @@ protected:
public: public:
// Returns the default context which usually is anti-aliased // Returns the default context which usually is anti-aliased
PangoContext *GtkGetPangoDefaultContext(); PangoContext *GTKGetPangoDefaultContext();
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
// applies tooltip to the widget (tip must be UTF-8 encoded) // applies tooltip to the widget (tip must be UTF-8 encoded)
@@ -340,17 +340,17 @@ protected:
// modified GTK style with non-standard attributes. If forceStyle=true, // modified GTK style with non-standard attributes. If forceStyle=true,
// creates empty GtkRcStyle if there are no modifications, otherwise // creates empty GtkRcStyle if there are no modifications, otherwise
// returns NULL in such case. // returns NULL in such case.
GtkRcStyle *CreateWidgetStyle(bool forceStyle = false); GtkRcStyle *GTKCreateWidgetStyle(bool forceStyle = false);
// Overridden in many GTK widgets who have to handle subwidgets // Overridden in many GTK widgets who have to handle subwidgets
virtual void ApplyWidgetStyle(bool forceStyle = false); virtual void GTKApplyWidgetStyle(bool forceStyle = false);
// helper function to ease native widgets wrapping, called by // helper function to ease native widgets wrapping, called by
// ApplyWidgetStyle -- override this, not ApplyWidgetStyle // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual void DoApplyWidgetStyle(GtkRcStyle *style);
// sets the border of a given GtkScrolledWindow from a wx style // sets the border of a given GtkScrolledWindow from a wx style
static void GtkScrolledWindowSetBorder(GtkWidget* w, int style); static void GTKScrolledWindowSetBorder(GtkWidget* w, int style);
// set the current cursor for all GdkWindows making part of this widget // set the current cursor for all GdkWindows making part of this widget
// (see GTKGetWindow) // (see GTKGetWindow)

View File

@@ -211,7 +211,7 @@ void wxButton::SetLabel( const wxString &lbl )
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
ApplyWidgetStyle( false ); GTKApplyWidgetStyle( false );
} }
bool wxButton::Enable( bool enable ) bool wxButton::Enable( bool enable )

View File

@@ -89,7 +89,7 @@ void wxControl::PostCreation(const wxSize& size)
// GetBestSize is called. // GetBestSize is called.
gtk_widget_ensure_style(m_widget); gtk_widget_ensure_style(m_widget);
ApplyWidgetStyle(); GTKApplyWidgetStyle();
SetInitialSize(size); SetInitialSize(size);
} }

View File

@@ -1828,7 +1828,7 @@ public:
m_window = window; m_window = window;
m_context = window->GtkGetPangoDefaultContext(); m_context = window->GTKGetPangoDefaultContext();
m_layout = pango_layout_new( m_context ); m_layout = pango_layout_new( m_context );
m_fontdesc = pango_font_description_copy( widget->style->font_desc ); m_fontdesc = pango_font_description_copy( widget->style->font_desc );
@@ -3829,7 +3829,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
m_widget = gtk_scrolled_window_new (NULL, NULL); m_widget = gtk_scrolled_window_new (NULL, NULL);
g_object_ref(m_widget); g_object_ref(m_widget);
GtkScrolledWindowSetBorder(m_widget, style); GTKScrolledWindowSetBorder(m_widget, style);
m_treeview = gtk_tree_view_new(); m_treeview = gtk_tree_view_new();
gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);

View File

@@ -282,7 +282,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y); SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y);
} }
m_context = window->GtkGetPangoDefaultContext(); m_context = window->GTKGetPangoDefaultContext();
m_layout = pango_layout_new( m_context ); m_layout = pango_layout_new( m_context );
m_fontdesc = pango_font_description_copy( widget->style->font_desc ); m_fontdesc = pango_font_description_copy( widget->style->font_desc );
@@ -1813,7 +1813,7 @@ void wxWindowDCImpl::SetFont( const wxFont &font )
{ {
PangoContext *oldContext = m_context; PangoContext *oldContext = m_context;
m_context = m_window->GtkGetPangoDefaultContext(); m_context = m_window->GTKGetPangoDefaultContext();
// If we switch back/forth between different contexts // If we switch back/forth between different contexts
// we also have to create a new layout. I think so, // we also have to create a new layout. I think so,

View File

@@ -375,7 +375,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
} }
GtkScrolledWindowSetBorder(m_widget, style); GTKScrolledWindowSetBorder(m_widget, style);
m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );

View File

@@ -91,7 +91,7 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
PostCreation(); PostCreation();
ApplyWidgetStyle(); GTKApplyWidgetStyle();
#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
g_object_ref(m_widget); g_object_ref(m_widget);

View File

@@ -422,7 +422,7 @@ bool wxNotebook::InsertPage( size_t position,
gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position); gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position);
/* apply current style */ /* apply current style */
GtkRcStyle *style = CreateWidgetStyle(); GtkRcStyle *style = GTKCreateWidgetStyle();
if ( style ) if ( style )
{ {
gtk_widget_modify_style(pageData->m_label, style); gtk_widget_modify_style(pageData->m_label, style);

View File

@@ -692,7 +692,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
GTKSetWrapMode(); GTKSetWrapMode();
GtkScrolledWindowSetBorder(m_widget, style); GTKScrolledWindowSetBorder(m_widget, style);
gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );

View File

@@ -280,7 +280,7 @@ void wxToggleButton::SetLabel(const wxString& label)
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
ApplyWidgetStyle( false ); GTKApplyWidgetStyle( false );
} }
bool wxToggleButton::Enable(bool enable /*=true*/) bool wxToggleButton::Enable(bool enable /*=true*/)

View File

@@ -3741,7 +3741,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
// apply style change (forceStyle=true so that new style is applied // apply style change (forceStyle=true so that new style is applied
// even if the bg colour changed from valid to wxNullColour) // even if the bg colour changed from valid to wxNullColour)
if (GetBackgroundStyle() != wxBG_STYLE_CUSTOM) if (GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
ApplyWidgetStyle(true); GTKApplyWidgetStyle(true);
return true; return true;
} }
@@ -3763,17 +3763,17 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
// apply style change (forceStyle=true so that new style is applied // apply style change (forceStyle=true so that new style is applied
// even if the bg colour changed from valid to wxNullColour): // even if the bg colour changed from valid to wxNullColour):
ApplyWidgetStyle(true); GTKApplyWidgetStyle(true);
return true; return true;
} }
PangoContext *wxWindowGTK::GtkGetPangoDefaultContext() PangoContext *wxWindowGTK::GTKGetPangoDefaultContext()
{ {
return gtk_widget_get_pango_context( m_widget ); return gtk_widget_get_pango_context( m_widget );
} }
GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle)
{ {
// do we need to apply any changes at all? // do we need to apply any changes at all?
if ( !forceStyle && if ( !forceStyle &&
@@ -3842,9 +3842,9 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
return style; return style;
} }
void wxWindowGTK::ApplyWidgetStyle(bool forceStyle) void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
{ {
GtkRcStyle *style = CreateWidgetStyle(forceStyle); GtkRcStyle *style = GTKCreateWidgetStyle(forceStyle);
if ( style ) if ( style )
{ {
DoApplyWidgetStyle(style); DoApplyWidgetStyle(style);
@@ -3905,7 +3905,7 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
{ {
// apply style change (forceStyle=true so that new style is applied // apply style change (forceStyle=true so that new style is applied
// even if the bg colour changed from valid to wxNullColour): // even if the bg colour changed from valid to wxNullColour):
ApplyWidgetStyle(true); GTKApplyWidgetStyle(true);
} }
return true; return true;
} }
@@ -4051,7 +4051,7 @@ bool wxWindowGTK::SetFont( const wxFont &font )
// apply style change (forceStyle=true so that new style is applied // apply style change (forceStyle=true so that new style is applied
// even if the font changed from valid to wxNullFont): // even if the font changed from valid to wxNullFont):
ApplyWidgetStyle(true); GTKApplyWidgetStyle(true);
return true; return true;
} }
@@ -4292,7 +4292,7 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
#endif // wxUSE_CARET #endif // wxUSE_CARET
} }
void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle) void wxWindowGTK::GTKScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
{ {
//RN: Note that static controls usually have no border on gtk, so maybe //RN: Note that static controls usually have no border on gtk, so maybe
//it makes sense to treat that as simply no border at the wx level //it makes sense to treat that as simply no border at the wx level