Tries unsuccesfully to cure a few more problems

    for DialogEd
  wxFileSelector now sets the title
  Todo is quite complete now

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

diff --git a/TODO.txt b/TODO.txt
index d57feae17b36f77a0d112e99725fe4433707284c..fe11d23cd6b28213f77699eccbe11a087fa5c82d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -21,18 +21,22 @@ Consistent keyboard interface and focus behaviour
 
 ================================ GTK  ==========================================
 
 
 ================================ GTK  ==========================================
 

-Set fonts in GTK widgets
-Set colour/baclgroundcolour in GTK widgets
+Add support Set colour/baclgroundcolour in GTK widgets

 Correct tab navigation (seems to be a GTK feature)
 Correct tab navigation (seems to be a GTK feature)

-DnD (postponed as GTK 1.2 will have new DnD)
-Clipboard
+Finish DnD (postponed as GTK 1.2 will have new DnD)
+Add Clipboard

 Help system (not sure about this one)
 Show accelerator in menus
 More controls with bitmaps
 Speed up bitmap saving
 Help system (not sure about this one)
 Show accelerator in menus
 More controls with bitmaps
 Speed up bitmap saving

-wxBitmapHandler
+Add wxBitmapHandler

 Fix printing of bitmaps
 Fix printing of bitmaps

-wxRadioBox layout and setsize
+Implement wxRadioBox layout
+Finish wxTextCtrl
+Finish native wxTreeCtrl
+Implement wxPalette
+Implement wxDirDialog
+Implement CopyOnWrite (unshare) for GDI objects
+Support cooperation between Qt and wxWindows

 TrueType support (just kidding)
 
 TrueType support (just kidding)
 

-wxTreeCtrl not yet finshed

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 654ae70bfe3424d33211b11599912bde1cda4479..d8105773729dbc130c666bec3116c07ab2424090 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -103,6 +103,7 @@ class wxComboBox: public wxControl
   
     wxList   m_clientData;
   
   
     wxList   m_clientData;
   

+    GtkWidget* GetConnectWidget(void);

 };
 
 #endif // __GTKCOMBOBOXH__
 };
 
 #endif // __GTKCOMBOBOXH__

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 654ae70bfe3424d33211b11599912bde1cda4479..d8105773729dbc130c666bec3116c07ab2424090 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -103,6 +103,7 @@ class wxComboBox: public wxControl
   
     wxList   m_clientData;
   
   
     wxList   m_clientData;
   

+    GtkWidget* GetConnectWidget(void);

 };
 
 #endif // __GTKCOMBOBOXH__
 };
 
 #endif // __GTKCOMBOBOXH__

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index b6c401e8e102602d2e29e37b0d67599a1bbbc576..11799f3b608934e0037f21a472eb6c8f5014d769 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -405,3 +405,9 @@ void wxComboBox::SetFont( const wxFont &font )
   }
 }
       
   }
 }
       

+GtkWidget* wxComboBox::GetConnectWidget(void)
+{
+  return GTK_COMBO(m_widget)->entry;
+}
+
+

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 6b705b101bfd09d9cb78ad7a0529870654600ca9..021946bb57d21bf0eb135e77cd255b765fd856e3 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -64,7 +64,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
   m_dialogStyle = style;
   m_filterIndex = 1;
 
   m_dialogStyle = style;
   m_filterIndex = 1;
 

-  m_widget = gtk_file_selection_new(_("File selection"));
+  m_widget = gtk_file_selection_new( m_message );

   
   int x = (gdk_screen_width () - 400) / 2;
   int y = (gdk_screen_height () - 400) / 2;
   
   int x = (gdk_screen_width () - 400) / 2;
   int y = (gdk_screen_height () - 400) / 2;

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 83c33ce33da0f08236d98441871ad2e5a5075d79..74449d7641e5834f92a863a8d38aa1f7f936366c 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -23,7 +23,7 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxSlider
+// "value_changed"

 //-----------------------------------------------------------------------------
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 //-----------------------------------------------------------------------------
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )


@@ -59,6 +59,10 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
   win->ProcessEvent( cevent );
 }
 
   win->ProcessEvent( cevent );
 }
 

+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 wxSlider::wxSlider(void)
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 wxSlider::wxSlider(void)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 47e9012dcb7645bff2e88d7950258aeb8680fee7..70c53851a70b840e5a97ff5b5cce88b4d1ac560b 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -317,7 +317,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
   }
     
   if (!win->HasVMT()) return TRUE;
   }
     
   if (!win->HasVMT()) return TRUE;

-    
+

 /*
   printf( "OnButtonPress from " );
   if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
 /*
   printf( "OnButtonPress from " );
   if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())


@@ -396,7 +396,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "button_release"
+// "button_release_event"

 //-----------------------------------------------------------------------------
 
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
 //-----------------------------------------------------------------------------
 
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index b6c401e8e102602d2e29e37b0d67599a1bbbc576..11799f3b608934e0037f21a472eb6c8f5014d769 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -405,3 +405,9 @@ void wxComboBox::SetFont( const wxFont &font )
   }
 }
       
   }
 }
       

+GtkWidget* wxComboBox::GetConnectWidget(void)
+{
+  return GTK_COMBO(m_widget)->entry;
+}
+
+

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 6b705b101bfd09d9cb78ad7a0529870654600ca9..021946bb57d21bf0eb135e77cd255b765fd856e3 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -64,7 +64,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
   m_dialogStyle = style;
   m_filterIndex = 1;
 
   m_dialogStyle = style;
   m_filterIndex = 1;
 

-  m_widget = gtk_file_selection_new(_("File selection"));
+  m_widget = gtk_file_selection_new( m_message );

   
   int x = (gdk_screen_width () - 400) / 2;
   int y = (gdk_screen_height () - 400) / 2;
   
   int x = (gdk_screen_width () - 400) / 2;
   int y = (gdk_screen_height () - 400) / 2;

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 83c33ce33da0f08236d98441871ad2e5a5075d79..74449d7641e5834f92a863a8d38aa1f7f936366c 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -23,7 +23,7 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxSlider
+// "value_changed"

 //-----------------------------------------------------------------------------
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 //-----------------------------------------------------------------------------
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )


@@ -59,6 +59,10 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
   win->ProcessEvent( cevent );
 }
 
   win->ProcessEvent( cevent );
 }
 

+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 wxSlider::wxSlider(void)
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 wxSlider::wxSlider(void)

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 47e9012dcb7645bff2e88d7950258aeb8680fee7..70c53851a70b840e5a97ff5b5cce88b4d1ac560b 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -317,7 +317,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
   }
     
   if (!win->HasVMT()) return TRUE;
   }
     
   if (!win->HasVMT()) return TRUE;

-    
+

 /*
   printf( "OnButtonPress from " );
   if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
 /*
   printf( "OnButtonPress from " );
   if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())


@@ -396,7 +396,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "button_release"
+// "button_release_event"

 //-----------------------------------------------------------------------------
 
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
 //-----------------------------------------------------------------------------
 
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )