Since wxREADONLY has disappeared, I had to change to wxTE_READONLY

in order to compile.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 5f73627ccff8663ecd3dc0576f5291629b3faeb8..d1a19473eb7b31f0b477dbfeae5127f0e92cac7c 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -60,7 +60,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
   PreCreation( parent, id, pos, size, style, name );
 
   bool bMultiLine = (style & wxTE_MULTILINE) != 0;
   PreCreation( parent, id, pos, size, style, name );
 
   bool bMultiLine = (style & wxTE_MULTILINE) != 0;

-  if ( bMultiLine ) 
+  if ( bMultiLine )

   {
     // a multi-line edit control: create a vertical scrollbar by default and
     // horizontal if requested
   {
     // a multi-line edit control: create a vertical scrollbar by default and
     // horizontal if requested


@@ -123,7 +123,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
   };
 
     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
   };
 

-  if (style & wxREADONLY)
+  if (style & wxTE_READONLY)

   {
   }
   else
   {
   }
   else


@@ -394,4 +394,4 @@ GtkWidget* wxTextCtrl::GetConnectWidget(void)
 
 
 
 
 
 

-  
+

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 5f73627ccff8663ecd3dc0576f5291629b3faeb8..d1a19473eb7b31f0b477dbfeae5127f0e92cac7c 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -60,7 +60,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
   PreCreation( parent, id, pos, size, style, name );
 
   bool bMultiLine = (style & wxTE_MULTILINE) != 0;
   PreCreation( parent, id, pos, size, style, name );
 
   bool bMultiLine = (style & wxTE_MULTILINE) != 0;

-  if ( bMultiLine ) 
+  if ( bMultiLine )

   {
     // a multi-line edit control: create a vertical scrollbar by default and
     // horizontal if requested
   {
     // a multi-line edit control: create a vertical scrollbar by default and
     // horizontal if requested


@@ -123,7 +123,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
   };
 
     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
   };
 

-  if (style & wxREADONLY)
+  if (style & wxTE_READONLY)

   {
   }
   else
   {
   }
   else


@@ -394,4 +394,4 @@ GtkWidget* wxTextCtrl::GetConnectWidget(void)
 
 
 
 
 
 

-  
+