From 97b3455a6d8063228347484ca5df6507341aeced Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 7 Sep 1998 09:17:58 +0000 Subject: [PATCH] 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 --- TODO.txt | 18 +++++++++++------- include/wx/gtk/combobox.h | 1 + include/wx/gtk1/combobox.h | 1 + src/gtk/combobox.cpp | 6 ++++++ src/gtk/filedlg.cpp | 2 +- src/gtk/slider.cpp | 6 +++++- src/gtk/window.cpp | 4 ++-- src/gtk1/combobox.cpp | 6 ++++++ src/gtk1/filedlg.cpp | 2 +- src/gtk1/slider.cpp | 6 +++++- src/gtk1/window.cpp | 4 ++-- 11 files changed, 41 insertions(+), 15 deletions(-) diff --git a/TODO.txt b/TODO.txt index d57feae17b..fe11d23cd6 100644 --- a/TODO.txt +++ b/TODO.txt @@ -21,18 +21,22 @@ Consistent keyboard interface and focus behaviour ================================ 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) -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 -wxBitmapHandler +Add wxBitmapHandler 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) -wxTreeCtrl not yet finshed diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 654ae70bfe..d810577372 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -103,6 +103,7 @@ class wxComboBox: public wxControl wxList m_clientData; + GtkWidget* GetConnectWidget(void); }; #endif // __GTKCOMBOBOXH__ diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 654ae70bfe..d810577372 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -103,6 +103,7 @@ class wxComboBox: public wxControl wxList m_clientData; + GtkWidget* GetConnectWidget(void); }; #endif // __GTKCOMBOBOXH__ diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index b6c401e8e1..11799f3b60 100644 --- 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 6b705b101b..021946bb57 100644 --- 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_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; diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 83c33ce33d..74449d7641 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -23,7 +23,7 @@ extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxSlider +// "value_changed" //----------------------------------------------------------------------------- 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 ); } +//----------------------------------------------------------------------------- +// wxSlider +//----------------------------------------------------------------------------- + IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) wxSlider::wxSlider(void) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 47e9012dcb..70c53851a7 100644 --- 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; - + /* 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 ) diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index b6c401e8e1..11799f3b60 100644 --- 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 6b705b101b..021946bb57 100644 --- 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_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; diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 83c33ce33d..74449d7641 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -23,7 +23,7 @@ extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxSlider +// "value_changed" //----------------------------------------------------------------------------- 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 ); } +//----------------------------------------------------------------------------- +// wxSlider +//----------------------------------------------------------------------------- + IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) wxSlider::wxSlider(void) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 47e9012dcb..70c53851a7 100644 --- 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; - + /* 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 ) -- 2.45.2