projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore socket initialization times counter.
[wxWidgets.git]
/
src
/
gtk
/
hyperlink.cpp
diff --git
a/src/gtk/hyperlink.cpp
b/src/gtk/hyperlink.cpp
index 665dba4c4f3db21a4f6ea3adfa52194c60fa658d..44645ce0fab075e2486aef667c436e289b849207 100644
(file)
--- a/
src/gtk/hyperlink.cpp
+++ b/
src/gtk/hyperlink.cpp
@@
-23,7
+23,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__)
+#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__)
&& !defined(__WXUNIVERSAL__)
#include "wx/hyperlink.h"
#include "wx/hyperlink.h"
@@
-76,9
+76,6
@@
bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
// do validation checks:
CheckParams(label, url, style);
// do validation checks:
CheckParams(label, url, style);
- m_needParent = true;
- m_acceptsFocus = true;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
@@
-87,7
+84,8
@@
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");
- gtk_widget_show( GTK_WIDGET(m_widget) );
+ g_object_ref(m_widget);
+ gtk_widget_show(m_widget);
// alignment
float x_alignment = 0.5;
// alignment
float x_alignment = 0.5;
@@
-144,7
+142,7
@@
void wxHyperlinkCtrl::SetLabel(const wxString &label)
void wxHyperlinkCtrl::SetURL(const wxString &uri)
{
if ( UseNative() )
void wxHyperlinkCtrl::SetURL(const wxString &uri)
{
if ( UseNative() )
- gtk_link_button_set_uri(GTK_LINK_BUTTON(m_widget),
uri.c_str(
));
+ gtk_link_button_set_uri(GTK_LINK_BUTTON(m_widget),
wxGTK_CONV(uri
));
else
wxGenericHyperlinkCtrl::SetURL(uri);
}
else
wxGenericHyperlinkCtrl::SetURL(uri);
}
@@
-154,7
+152,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 wx
ConvFileName->cMB2WX(str
);
+ return wx
String(str, *wxConvFileName
);
}
return wxGenericHyperlinkCtrl::GetURL();
}
return wxGenericHyperlinkCtrl::GetURL();