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

minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-03-08 04:28:09 +00:00
parent 6d020baf20
commit cc9ffc23f3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/hyperlink.cpp
View File

@@ -37,7 +37,7 @@
// local functions // local functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
inline bool UseNative() static inline bool UseNative()
{ {
// native gtk_link_button widget is only available in GTK+ 2.10 and later // native gtk_link_button widget is only available in GTK+ 2.10 and later
return !gtk_check_version(2, 10, 0); return !gtk_check_version(2, 10, 0);
@@ -172,21 +172,21 @@ void wxHyperlinkCtrl::SetNormalColour(const wxColour &colour)
wxColour wxHyperlinkCtrl::GetNormalColour() const wxColour wxHyperlinkCtrl::GetNormalColour() const
{ {
wxColour ret;
if ( UseNative() ) if ( UseNative() )
{ {
GdkColor *link_color = NULL; GdkColor *link_color = NULL;
wxColour ret = wxNullColour;
// convert GdkColor in wxColour // convert GdkColor in wxColour
gtk_widget_style_get(m_widget, "link-color", &link_color, NULL); gtk_widget_style_get(m_widget, "link-color", &link_color, NULL);
if (link_color) if (link_color)
ret.Set(link_color->red, link_color->green, link_color->blue); ret = wxColour(*link_color);
gdk_color_free (link_color); gdk_color_free (link_color);
return ret;
} }
else else
return wxGenericHyperlinkCtrl::GetNormalColour(); ret = wxGenericHyperlinkCtrl::GetNormalColour();
return ret;
} }
void wxHyperlinkCtrl::SetVisitedColour(const wxColour &colour) void wxHyperlinkCtrl::SetVisitedColour(const wxColour &colour)
@@ -201,21 +201,21 @@ void wxHyperlinkCtrl::SetVisitedColour(const wxColour &colour)
wxColour wxHyperlinkCtrl::GetVisitedColour() const wxColour wxHyperlinkCtrl::GetVisitedColour() const
{ {
wxColour ret;
if ( UseNative() ) if ( UseNative() )
{ {
GdkColor *link_color = NULL; GdkColor *link_color = NULL;
wxColour ret = wxNullColour;
// convert GdkColor in wxColour // convert GdkColor in wxColour
gtk_widget_style_get(m_widget, "visited-link-color", &link_color, NULL); gtk_widget_style_get(m_widget, "visited-link-color", &link_color, NULL);
if (link_color) if (link_color)
ret.Set(link_color->red, link_color->green, link_color->blue); ret = wxColour(*link_color);
gdk_color_free (link_color); gdk_color_free (link_color);
return ret;
} }
else else
return wxGenericHyperlinkCtrl::GetVisitedColour(); return wxGenericHyperlinkCtrl::GetVisitedColour();
return ret;
} }
void wxHyperlinkCtrl::SetHoverColour(const wxColour &colour) void wxHyperlinkCtrl::SetHoverColour(const wxColour &colour)