GTK

combobox idle handling makefile fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-06-03 19:06:13 +00:00
parent 884d770ab5
commit 53010e52d3
17 changed files with 864 additions and 103 deletions
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -61,9 +61,13 @@ bool wxYield(void)

 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)

+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxApp::OnIdle)
+END_EVENT_TABLE()
+
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
-  if (wxTheApp) wxTheApp->OnIdle();
+  if (wxTheApp) while (wxTheApp->ProcessIdle()) {};
  usleep( 10000 );
  return TRUE;
 };
@@ -96,10 +100,78 @@ int wxApp::OnRun(void)
  return MainLoop(); 
 };

-bool wxApp::OnIdle(void)
+bool wxApp::ProcessIdle(void)
 {
+  wxIdleEvent event;
+  event.SetEventObject( this );
+  ProcessEvent( event );
+  
+  return event.MoreRequested();
+};
+
+void wxApp::OnIdle( wxIdleEvent &event )
+{
+  static bool inOnIdle = FALSE;
+
+  // Avoid recursion (via ProcessEvent default case)
+  if (inOnIdle)
+    return;
+
+  inOnIdle = TRUE;
+
+  // 'Garbage' collection of windows deleted with Close().
  DeletePendingObjects();
-  return FALSE;
+
+  // flush the logged messages if any
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL && pLog->HasPendingMessages() )
+    pLog->Flush();
+
+  // Send OnIdle events to all windows
+  bool needMore = SendIdleEvents();
+
+  if (needMore)
+    event.RequestMore(TRUE);
+
+  inOnIdle = FALSE;
+};
+
+bool wxApp::SendIdleEvents(void)
+{
+    bool needMore = FALSE;
+	wxNode* node = wxTopLevelWindows.First();
+	while (node)
+	{
+		wxWindow* win = (wxWindow*) node->Data();
+		if (SendIdleEvents(win))
+            needMore = TRUE;
+
+		node = node->Next();
+	}
+    return needMore;
+};
+
+bool wxApp::SendIdleEvents( wxWindow* win )
+{
+    bool needMore = FALSE;
+
+	wxIdleEvent event;
+	event.SetEventObject(win);
+	win->ProcessEvent(event);
+
+    if (event.MoreRequested())
+        needMore = TRUE;
+
+	wxNode* node = win->GetChildren()->First();
+	while (node)
+	{
+		wxWindow* win = (wxWindow*) node->Data();
+		if (SendIdleEvents(win))
+            needMore = TRUE;
+
+		node = node->Next();
+	}
+    return needMore ;
 };

 int wxApp::OnExit(void)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -0,0 +1,282 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        combobox.cpp
+// Purpose:
+// Author:      Robert Roebling
+// Created:     01/02/97
+// Id:
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "combobox.h"
+#endif
+
+#include "wx/combobox.h"
+
+//-----------------------------------------------------------------------------
+// wxComboBox
+//-----------------------------------------------------------------------------
+
+void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+{
+  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
+  event.SetInt( combo->GetSelection() );
+  wxString tmp( combo->GetStringSelection() );
+  event.SetString( WXSTRINGCAST(tmp) );
+  event.SetEventObject(combo);
+  combo->ProcessEvent(event);
+};
+
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
+
+bool wxComboBox::Create(wxWindow *parent, const wxWindowID id, const wxString& value,
+  const wxPoint& pos, const wxSize& size,
+  const int n, const wxString choices[],
+  const long style, const wxString& name )
+{
+  m_needParent = TRUE;
+  
+  PreCreation( parent, id, pos, size, style, name );
+  
+  m_widget = gtk_combo_new();
+  
+  wxSize newSize = size;
+  if (newSize.x == -1) newSize.x = 100;
+  if (newSize.y == -1) newSize.y = 26;
+  SetSize( newSize.x, newSize.y );
+  
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  for (int i = 0; i < n; i++)
+  {
+    GtkWidget *list_item;
+    list_item = gtk_list_item_new_with_label( choices[i] ); 
+  
+    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+  
+    gtk_container_add( GTK_CONTAINER(list), list_item );
+    
+    gtk_widget_show( list_item );
+  };
+  
+  PostCreation();
+
+  if (!value.IsNull()) SetValue( value );
+    
+  Show( TRUE );
+    
+  return TRUE;
+};
+
+void wxComboBox::Clear(void)
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+};
+
+void wxComboBox::Append( const wxString &item )
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GtkWidget *list_item;
+  list_item = gtk_list_item_new_with_label( item ); 
+  
+ gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+    GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+  
+  gtk_container_add( GTK_CONTAINER(list), list_item );
+    
+  gtk_widget_show( list_item );
+};
+
+void wxComboBox::Append( const wxString &WXUNUSED(item), char* WXUNUSED(clientData) )
+{
+};
+
+void wxComboBox::Delete( const int n )
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  gtk_list_clear_items( GTK_LIST(list), n, n );
+};
+
+int wxComboBox::FindString( const wxString &item )
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GList *child = GTK_LIST(list)->children;
+  int count = 0;
+  while (child)
+  {
+    GtkBin *bin = GTK_BIN( child->data );
+    GtkLabel *label = GTK_LABEL( bin->child );
+    if (item == label->label) return count;
+    count++;
+    child = child->next;
+  };
+  return -1;
+};
+
+char* wxComboBox::GetClientData( const int n )
+{
+  wxNode *node = m_clientData.Nth( n );
+  if (node) return (char*)node->Data();
+  return NULL;
+};
+
+void wxComboBox::SetClientData( const int n, char * clientData )
+{
+  wxNode *node = m_clientData.Nth( n );
+  if (node) node->SetData( (wxObject*) clientData );
+};
+
+int wxComboBox::GetSelection(void) const
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GList *selection = GTK_LIST(list)->selection;
+  if (selection)
+  {
+    GList *child = GTK_LIST(list)->children;
+    int count = 0;
+    while (child)
+    {
+      if (child->data == selection->data) return count;
+      count++;
+      child = child->next;
+    };
+  };
+  return -1;
+};
+
+wxString wxComboBox::GetString( const int n ) const
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GList *child = g_list_nth( GTK_LIST(list)->children, n );
+  if (child)
+  {
+    GtkBin *bin = GTK_BIN( child->data );
+    GtkLabel *label = GTK_LABEL( bin->child );
+    return label->label;
+  };
+  return "";
+};
+
+wxString wxComboBox::GetStringSelection(void) const
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GList *selection = GTK_LIST(list)->selection;
+  if (selection)
+  {
+    GtkBin *bin = GTK_BIN( selection->data );
+    wxString tmp = GTK_LABEL( bin->child )->label;
+    return tmp;
+  };
+  return "";
+};
+
+int wxComboBox::Number(void) const
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GList *child = GTK_LIST(list)->children;
+  int count = 0;
+  while (child) { count++; child = child->next; };
+  return count;
+};
+
+void wxComboBox::SetSelection( const int n )
+{
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  gtk_list_select_item( GTK_LIST(list), n );
+};
+
+wxString wxComboBox::GetValue(void) const
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
+  return tmp;
+};
+
+void wxComboBox::SetValue( const wxString& value )
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  wxString tmp = "";
+  if (!value.IsNull()) tmp = value;
+  gtk_entry_set_text( GTK_ENTRY(entry), tmp );
+};
+
+void wxComboBox::Copy(void)
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
+};
+
+void wxComboBox::Cut(void)
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
+};
+
+void wxComboBox::Paste(void)
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
+};
+
+void wxComboBox::SetInsertionPoint( const long pos )
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  int tmp = (int) pos;
+  gtk_entry_set_position( GTK_ENTRY(entry), tmp );
+};
+
+void wxComboBox::SetInsertionPointEnd(void)
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  int pos = GTK_ENTRY(entry)->text_length;
+  SetInsertionPoint( pos-1 );
+};
+
+long wxComboBox::GetInsertionPoint(void) const
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  return (long) GTK_EDITABLE(entry)->current_pos;
+};
+
+long wxComboBox::GetLastPosition(void) const
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  int pos = GTK_ENTRY(entry)->text_length;
+  return (long) pos-1;
+};
+
+void wxComboBox::Replace( const long from, const long to, const wxString& value )
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
+  if (value.IsNull()) return;
+  gint pos = (gint)to;
+  gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
+};
+
+void wxComboBox::Remove(const long from, const long to)
+{
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
+};
+
+void wxComboBox::SetSelection( const long WXUNUSED(from), const long WXUNUSED(to) )
+{
+};
+
+void wxComboBox::SetEditable( const bool WXUNUSED(editable) )
+{
+};
+
+      
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -314,10 +314,13 @@ bool wxNotebook::DeletePage( const int page )
    page_num++;
    child = child->next;
  };
-   
-  if (!child) wxFatalError( "Notebook delete error" );;
+
+  wxASSERT( child );
+        
+  delete nb_page->m_clientPanel;
  
-  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+//  Amazingly, this is not necessary
+//  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
  
  m_pages.DeleteObject( nb_page );
    
@@ -341,7 +344,9 @@ wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int
    
  m_frame = NULL;
  
-  page->m_page = GTK_NOTEBOOK(m_widget)->cur_page;
+  page->m_page = (GtkNotebookPage*)( g_list_last( GTK_NOTEBOOK(m_widget)->children )->data );
+  
+  if (!page->m_page) wxFatalError( "Notebook page creation error" );
  
  m_pages.Append( page );

--- a/src/gtk1/setup/maketmpl.in
+++ b/src/gtk1/setup/maketmpl.in
@@ -95,13 +95,14 @@ $(TOOLKIT_DEF) \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \
-I$(WXBASEDIR)/src/png \
-I$(WXBASEDIR)/src/zlib \
-I$(WXBASEDIR)/src/gdk_imlib \
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)

+# -I$(WXBASEDIR)/src/png \
+# -I$(WXBASEDIR)/src/zlib \
+# -I$(WXBASEDIR)/src/gdk_imlib \
+
 WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk

 OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)