projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update documentation about custom schemes and virtual file systems.
[wxWidgets.git]
/
src
/
gtk
/
hyperlink.cpp
diff --git
a/src/gtk/hyperlink.cpp
b/src/gtk/hyperlink.cpp
index d9d9ea1420f82963ca2e76d9ca2a6f117136b540..21610311c50dea1c813a723aba8973d8e45dc757 100644
(file)
--- a/
src/gtk/hyperlink.cpp
+++ b/
src/gtk/hyperlink.cpp
@@
-47,9
+47,6
@@
static inline bool UseNative()
// implementation
// ============================================================================
// implementation
// ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxGenericHyperlinkCtrl)
-
-
// ----------------------------------------------------------------------------
// "clicked"
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// "clicked"
// ----------------------------------------------------------------------------
@@
-84,6
+81,7
@@
bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
}
m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");
}
m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");
+ g_object_ref(m_widget);
gtk_widget_show(m_widget);
// alignment
gtk_widget_show(m_widget);
// alignment
@@
-106,7
+104,6
@@
bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
m_parent->DoAddChild( this );
PostCreation(size);
m_parent->DoAddChild( this );
PostCreation(size);
- SetInitialSize(size);
// wxWindowGTK will connect to the enter_notify and leave_notify GTK+ signals
// thus overriding GTK+'s internal signal handlers which set the cursor of
// wxWindowGTK will connect to the enter_notify and leave_notify GTK+ signals
// thus overriding GTK+'s internal signal handlers which set the cursor of
@@
-126,6
+123,13
@@
wxSize wxHyperlinkCtrl::DoGetBestSize() const
return wxGenericHyperlinkCtrl::DoGetBestSize();
}
return wxGenericHyperlinkCtrl::DoGetBestSize();
}
+wxSize wxHyperlinkCtrl::DoGetBestClientSize() const
+{
+ if ( UseNative() )
+ return wxControl::DoGetBestClientSize();
+ return wxGenericHyperlinkCtrl::DoGetBestClientSize();
+}
+
void wxHyperlinkCtrl::SetLabel(const wxString &label)
{
if ( UseNative() )
void wxHyperlinkCtrl::SetLabel(const wxString &label)
{
if ( UseNative() )
@@
-151,7
+155,7
@@
wxString wxHyperlinkCtrl::GetURL() const
if ( UseNative() )
{
const gchar *str = gtk_link_button_get_uri(GTK_LINK_BUTTON(m_widget));
if ( UseNative() )
{
const gchar *str = gtk_link_button_get_uri(GTK_LINK_BUTTON(m_widget));
- return wxString
(str, *wxConvFileName
);
+ return wxString
::FromUTF8(str
);
}
return wxGenericHyperlinkCtrl::GetURL();
}
return wxGenericHyperlinkCtrl::GetURL();