Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Next take at combobox.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-02-27 20:24:16 +00:00
parent c0a6a6df9e
commit ab7def879f
2 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gtk/combobox.cpp
View File

@@ -35,6 +35,8 @@ extern bool g_isIdle;
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
static bool gs_typedSelection = FALSE;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "select-child" - click/cursor get select-child, changed, select-child // "select-child" - click/cursor get select-child, changed, select-child
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -48,6 +50,9 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
if (!gs_typedSelection)
{
if (combo->m_alreadySent) if (combo->m_alreadySent)
{ {
combo->m_alreadySent = FALSE; combo->m_alreadySent = FALSE;
@@ -55,6 +60,11 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
} }
combo->m_alreadySent = TRUE; combo->m_alreadySent = TRUE;
}
else
{
gs_typedSelection = FALSE;
}
int curSelection = combo->GetSelection(); int curSelection = combo->GetSelection();
@@ -86,6 +96,15 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
if (!combo->m_hasVMT) return; if (!combo->m_hasVMT) return;
if ((combo->FindString(combo->GetValue()) != wxNOT_FOUND) && !combo->m_alreadySent)
{
gs_typedSelection = TRUE;
// Do we send a TEXT_UPDATE event if we send a CMOBOBOX event
// anyways? I think so.
// return;
}
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() ); event.SetString( combo->GetValue() );
event.SetEventObject( combo ); event.SetEventObject( combo );
@@ -155,9 +174,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
ConnectWidget( GTK_COMBO(m_widget)->button ); ConnectWidget( GTK_COMBO(m_widget)->button );
// MSW's combo box starts empty // MSW's combo box shows the value and the selection is -1
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_entry_set_text( GTK_ENTRY(entry), "" ); gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV(value) );
if (style & wxCB_READONLY) if (style & wxCB_READONLY)
gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE ); gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );

23
src/gtk1/combobox.cpp
View File

@@ -35,6 +35,8 @@ extern bool g_isIdle;
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
static bool gs_typedSelection = FALSE;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "select-child" - click/cursor get select-child, changed, select-child // "select-child" - click/cursor get select-child, changed, select-child
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -48,6 +50,9 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
if (!gs_typedSelection)
{
if (combo->m_alreadySent) if (combo->m_alreadySent)
{ {
combo->m_alreadySent = FALSE; combo->m_alreadySent = FALSE;
@@ -55,6 +60,11 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
} }
combo->m_alreadySent = TRUE; combo->m_alreadySent = TRUE;
}
else
{
gs_typedSelection = FALSE;
}
int curSelection = combo->GetSelection(); int curSelection = combo->GetSelection();
@@ -86,6 +96,15 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
if (!combo->m_hasVMT) return; if (!combo->m_hasVMT) return;
if ((combo->FindString(combo->GetValue()) != wxNOT_FOUND) && !combo->m_alreadySent)
{
gs_typedSelection = TRUE;
// Do we send a TEXT_UPDATE event if we send a CMOBOBOX event
// anyways? I think so.
// return;
}
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() ); event.SetString( combo->GetValue() );
event.SetEventObject( combo ); event.SetEventObject( combo );
@@ -155,9 +174,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
ConnectWidget( GTK_COMBO(m_widget)->button ); ConnectWidget( GTK_COMBO(m_widget)->button );
// MSW's combo box starts empty // MSW's combo box shows the value and the selection is -1
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_entry_set_text( GTK_ENTRY(entry), "" ); gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV(value) );
if (style & wxCB_READONLY) if (style & wxCB_READONLY)
gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE ); gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );