From: Robert Roebling <robert@roebling.de>
Date: Sat, 8 Jan 2005 15:41:04 +0000 (+0000)
Subject:  Compile fixes for GTK 1.2
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/44c5573d2e1f1239b7215551c8861f26fe666f2c?ds=inline

 Compile fixes for GTK 1.2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 78127baff2..627a4e3489 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -219,8 +219,10 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     // and case-sensitive
     gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 
+#ifdef __WXGTK20__
     if (style & wxNO_BORDER)
         g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
+#endif
         
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index dc1e79cbd7..a970bf7dd5 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -396,9 +396,11 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
-        
+
+#ifdef __WXGTK20__        
         if (style & wxNO_BORDER)
             g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
+#endif
     }
 
     m_parent->DoAddChild( this );
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 78127baff2..627a4e3489 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -219,8 +219,10 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     // and case-sensitive
     gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 
+#ifdef __WXGTK20__
     if (style & wxNO_BORDER)
         g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
+#endif
         
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index dc1e79cbd7..a970bf7dd5 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -396,9 +396,11 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
-        
+
+#ifdef __WXGTK20__        
         if (style & wxNO_BORDER)
             g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
+#endif
     }
 
     m_parent->DoAddChild( this );