From 8b6d09851db68b8930cc748c955b747316377c5c Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 17 Jul 2000 17:07:07 +0000 Subject: [PATCH] Made checkable menu items use wxCommantEvent::Checked Made wxComboBox case sensitive. Updates CHANGES.txt git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/gtk/changes.txt | 23 ++++++++++++++++++++++- src/gtk/combobox.cpp | 6 +++++- src/gtk/menu.cpp | 3 ++- src/gtk1/combobox.cpp | 6 +++++- src/gtk1/menu.cpp | 3 ++- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index ce290c2c1f..fe1eb4f1fb 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,4 +1,25 @@ -10th July 2000: wxWindows 2.2 released + +22nd July 2000: wxWindows 2.2.1 released + +Minor build fixes. + +Corrected guffow-scrolling so that no surplus expose +events are generated. + +Corrected bug in wxMask creation on 16-bit displays. + +Minor correction to wxDC::DrawRoundedRectangle. + +Added support for and menu accelerators. + +Use the wxCommmandEvent::IsChecked() function for checkable +menu items. + +Made wxComboBox case-sensitive. + +Minor correction to doc-view architecture. + +10th July 2000: wxWindows 2.2.0 released Added code for writing BMP images. diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index fe859bb2ee..023caa971e 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -111,7 +111,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, m_widget = gtk_combo_new(); // make it more useable - gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE); + gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); + + // and case-sensitive + gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); + GtkWidget *list = GTK_COMBO(m_widget)->list; diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 351ac19925..b3b73c34f5 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -567,7 +567,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); event.SetEventObject( menu ); - event.SetInt(id ); + if (item->IsCheckable()) + event.SetInt( item->IsChecked() ); #if wxUSE_MENU_CALLBACK if (menu->GetCallback()) diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index fe859bb2ee..023caa971e 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -111,7 +111,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, m_widget = gtk_combo_new(); // make it more useable - gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE); + gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); + + // and case-sensitive + gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); + GtkWidget *list = GTK_COMBO(m_widget)->list; diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 351ac19925..b3b73c34f5 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -567,7 +567,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); event.SetEventObject( menu ); - event.SetInt(id ); + if (item->IsCheckable()) + event.SetInt( item->IsChecked() ); #if wxUSE_MENU_CALLBACK if (menu->GetCallback())