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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index d8746af217064acb8de4ec831897ab802e46449b..78127baff20acd2dd276cca0d64bc8867f92845e 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -219,6 +219,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     // and case-sensitive
     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;
 
 #ifndef __WXGTK20__

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 3aeaa60599ca1ac1847737a5689c1f65747f1e0c..dc1e79cbd7d075d422837f70c87b8611254b4def 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -396,6 +396,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
+        
+        if (style & wxNO_BORDER)
+            g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
     }
 
     m_parent->DoAddChild( this );

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index d8746af217064acb8de4ec831897ab802e46449b..78127baff20acd2dd276cca0d64bc8867f92845e 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -219,6 +219,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     // and case-sensitive
     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;
 
 #ifndef __WXGTK20__

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 3aeaa60599ca1ac1847737a5689c1f65747f1e0c..dc1e79cbd7d075d422837f70c87b8611254b4def 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -396,6 +396,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
+        
+        if (style & wxNO_BORDER)
+            g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
     }
 
     m_parent->DoAddChild( this );