more bug fixes after USE_ to wxUSE_ change (now it finally seems to work)

[wxWidgets.git] / src / gtk / textctrl.cpp

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 46d4e1bffb461a14b940978a41068e877b11b8ce..44c3429337f1a184ec398f1eb6a3713193812341 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -17,19 +17,28 @@
 #include <wx/intl.h>
 
 //-----------------------------------------------------------------------------
 #include <wx/intl.h>
 
 //-----------------------------------------------------------------------------

-//  wxTextCtrl
+//  "changed"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
-

 static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
   win->SetModified();
 static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
   win->SetModified();

+  
+  wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
+  wxString val( win->GetValue() );
+  if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val;
+  event.SetEventObject( win );
+  win->GetEventHandler()->ProcessEvent( event );

 }
 
 }
 

+//-----------------------------------------------------------------------------
+//  wxTextCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)

 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)

-//  EVT_CHAR(wxTextCtrl::OnChar)
+  EVT_CHAR(wxTextCtrl::OnChar)

 END_EVENT_TABLE()
 
 wxTextCtrl::wxTextCtrl(void) : streambuf()
 END_EVENT_TABLE()
 
 wxTextCtrl::wxTextCtrl(void) : streambuf()


@@ -67,7 +76,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     bool bHasHScrollbar = (style & wxHSCROLL) != 0;
 
     // create our control...
     bool bHasHScrollbar = (style & wxHSCROLL) != 0;
 
     // create our control...

-    m_text = gtk_text_new( NULL, NULL );
+    m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );

 
     // ... and put into the upper left hand corner of the table
     m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
 
     // ... and put into the upper left hand corner of the table
     m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);


@@ -77,7 +86,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                      0, 0);
 
     // put the horizontal scrollbar in the lower left hand corner
                      0, 0);
 
     // put the horizontal scrollbar in the lower left hand corner

-    if ( bHasHScrollbar ) {
+    if (bHasHScrollbar) 
+    {

       GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
       gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
                        GTK_EXPAND | GTK_FILL,
       GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
       gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
                        GTK_EXPAND | GTK_FILL,


@@ -92,9 +102,10 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                      GTK_FILL,
                      GTK_EXPAND | GTK_FILL | GTK_SHRINK,
                      0, 0);
                      GTK_FILL,
                      GTK_EXPAND | GTK_FILL | GTK_SHRINK,
                      0, 0);

-    gtk_widget_show(vscrollbar);
+    gtk_widget_show( vscrollbar );

   }
   }

-  else {
+  else 
+  {

     // a single-line text control: no need for scrollbars
     m_widget =
     m_text = gtk_entry_new();
     // a single-line text control: no need for scrollbars
     m_widget =
     m_text = gtk_entry_new();


@@ -107,7 +118,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
 
   PostCreation();
 
 
   PostCreation();
 

-  if ( bMultiLine ) {
+  if (bMultiLine) 
+  {

     gtk_widget_realize(m_text);
     gtk_widget_show(m_text);
   }
     gtk_widget_realize(m_text);
     gtk_widget_show(m_text);
   }


@@ -128,7 +140,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
   }
   else
   {
   }
   else
   {

-    if ( bMultiLine )
+    if (bMultiLine)

       gtk_text_set_editable( GTK_TEXT(m_text), 1 );
   }
 
       gtk_text_set_editable( GTK_TEXT(m_text), 1 );
   }
 


@@ -306,8 +318,24 @@ void wxTextCtrl::Delete(void)
   SetValue( "" );
 }
 
   SetValue( "" );
 }
 

-void wxTextCtrl::OnChar( wxKeyEvent &WXUNUSED(event) )
+void wxTextCtrl::OnChar( wxKeyEvent &key_event )

 {
 {

+  if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+  {
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+    event.SetEventObject(this);
+    if (GetEventHandler()->ProcessEvent(event)) return;
+  }
+  else if (key_event.KeyCode() == WXK_TAB) 
+  {
+    wxNavigationKeyEvent event;
+    event.SetDirection( key_event.m_shiftDown );
+    event.SetWindowChange(FALSE);
+    event.SetEventObject(this);
+
+    if (GetEventHandler()->ProcessEvent(event)) return;
+  }
+  key_event.Skip();

 }
 
 int wxTextCtrl::overflow( int WXUNUSED(c) )
 }
 
 int wxTextCtrl::overflow( int WXUNUSED(c) )


@@ -392,6 +420,36 @@ GtkWidget* wxTextCtrl::GetConnectWidget(void)
   return GTK_WIDGET(m_text);
 }
 
   return GTK_WIDGET(m_text);
 }
 

+bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
+{
+  if (m_windowStyle & wxTE_MULTILINE)
+    return (window == GTK_TEXT(m_text)->text_area);
+  else
+    return (window == GTK_ENTRY(m_text)->text_area);
+}

 
 

+void wxTextCtrl::SetFont( const wxFont &font )
+{
+  if (((wxFont*)&font)->Ok())
+    m_font = font;
+  else
+    m_font = *wxSWISS_FONT;
+  
+  GtkStyle *style = (GtkStyle*) NULL;
+  if (!m_hasOwnStyle)
+  {
+    m_hasOwnStyle = TRUE;
+    style = gtk_style_copy( gtk_widget_get_style( m_text ) );
+  }
+  else
+  {
+    style = gtk_widget_get_style( m_text );
+  }
+  
+  gdk_font_unref( style->font );
+  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+  
+  gtk_widget_set_style( m_text, style );
+}