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

fixed menu titles handling after wxID_SEPARATOR change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-13 16:24:46 +00:00
parent e70ba80d53
commit 9959e2b6aa
2 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/menu.cpp
View File

@@ -46,6 +46,9 @@
#define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
#endif #endif
// we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -639,6 +642,12 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
wxMenuItem* item = menu->FindChildItem( id ); wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") ); wxCHECK_RET( item, wxT("error in menu item callback") );
if ( item->GetId() == wxGTK_TITLE_ID )
{
// ignore events from the menu title
return;
}
if (item->IsCheckable()) if (item->IsCheckable())
{ {
bool isReallyChecked = item->IsChecked(), bool isReallyChecked = item->IsChecked(),
@@ -983,7 +992,7 @@ void wxMenu::Init()
// Tearoffs are entries, just like separators. So if we want this // Tearoffs are entries, just like separators. So if we want this
// menu to be a tear-off one, we just append a tearoff entry // menu to be a tear-off one, we just append a tearoff entry
// immediately. // immediately.
if(m_style & wxMENU_TEAROFF) if ( m_style & wxMENU_TEAROFF )
{ {
GtkWidget *tearoff = gtk_tearoff_menu_item_new(); GtkWidget *tearoff = gtk_tearoff_menu_item_new();
@@ -993,9 +1002,9 @@ void wxMenu::Init()
m_prevRadio = NULL; m_prevRadio = NULL;
// append the title as the very first entry if we have it // append the title as the very first entry if we have it
if ( !!m_title ) if ( !m_title.empty() )
{ {
Append(-2, m_title); Append(wxGTK_TITLE_ID, m_title);
AppendSeparator(); AppendSeparator();
} }
} }

15
src/gtk1/menu.cpp
View File

@@ -46,6 +46,9 @@
#define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
#endif #endif
// we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -639,6 +642,12 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
wxMenuItem* item = menu->FindChildItem( id ); wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") ); wxCHECK_RET( item, wxT("error in menu item callback") );
if ( item->GetId() == wxGTK_TITLE_ID )
{
// ignore events from the menu title
return;
}
if (item->IsCheckable()) if (item->IsCheckable())
{ {
bool isReallyChecked = item->IsChecked(), bool isReallyChecked = item->IsChecked(),
@@ -983,7 +992,7 @@ void wxMenu::Init()
// Tearoffs are entries, just like separators. So if we want this // Tearoffs are entries, just like separators. So if we want this
// menu to be a tear-off one, we just append a tearoff entry // menu to be a tear-off one, we just append a tearoff entry
// immediately. // immediately.
if(m_style & wxMENU_TEAROFF) if ( m_style & wxMENU_TEAROFF )
{ {
GtkWidget *tearoff = gtk_tearoff_menu_item_new(); GtkWidget *tearoff = gtk_tearoff_menu_item_new();
@@ -993,9 +1002,9 @@ void wxMenu::Init()
m_prevRadio = NULL; m_prevRadio = NULL;
// append the title as the very first entry if we have it // append the title as the very first entry if we have it
if ( !!m_title ) if ( !m_title.empty() )
{ {
Append(-2, m_title); Append(wxGTK_TITLE_ID, m_title);
AppendSeparator(); AppendSeparator();
} }
} }