Applied wxNO_BORDER patch for text control and combo box.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -219,6 +219,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
|||||||
// and case-sensitive
|
// and case-sensitive
|
||||||
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
|
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
|
||||||
|
|
||||||
|
if (style & wxNO_BORDER)
|
||||||
|
g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
|
||||||
|
|
||||||
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
||||||
|
|
||||||
#ifndef __WXGTK20__
|
#ifndef __WXGTK20__
|
||||||
|
@@ -396,6 +396,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
|
|||||||
// a single-line text control: no need for scrollbars
|
// a single-line text control: no need for scrollbars
|
||||||
m_widget =
|
m_widget =
|
||||||
m_text = gtk_entry_new();
|
m_text = gtk_entry_new();
|
||||||
|
|
||||||
|
if (style & wxNO_BORDER)
|
||||||
|
g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
|
||||||
}
|
}
|
||||||
|
|
||||||
m_parent->DoAddChild( this );
|
m_parent->DoAddChild( this );
|
||||||
|
@@ -219,6 +219,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
|||||||
// and case-sensitive
|
// and case-sensitive
|
||||||
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
|
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
|
||||||
|
|
||||||
|
if (style & wxNO_BORDER)
|
||||||
|
g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
|
||||||
|
|
||||||
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
||||||
|
|
||||||
#ifndef __WXGTK20__
|
#ifndef __WXGTK20__
|
||||||
|
@@ -396,6 +396,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
|
|||||||
// a single-line text control: no need for scrollbars
|
// a single-line text control: no need for scrollbars
|
||||||
m_widget =
|
m_widget =
|
||||||
m_text = gtk_entry_new();
|
m_text = gtk_entry_new();
|
||||||
|
|
||||||
|
if (style & wxNO_BORDER)
|
||||||
|
g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
|
||||||
}
|
}
|
||||||
|
|
||||||
m_parent->DoAddChild( this );
|
m_parent->DoAddChild( this );
|
||||||
|
Reference in New Issue
Block a user