#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/frame.h"
+ #include "wx/bitmap.h"
#include "wx/app.h"
#endif
-#include "wx/bitmap.h"
-
-#if wxUSE_ACCEL
- #include "wx/accel.h"
-#endif // wxUSE_ACCEL
-
+#include "wx/accel.h"
+#include "wx/stockitem.h"
#include "wx/gtk/private.h"
-#include <gdk/gdkkeysyms.h>
-
-// FIXME: is this right? somehow I don't think so (VZ)
#ifdef __WXGTK20__
- #include <glib-object.h>
-
- #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
- #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
- #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
- #define ACCEL_OBJECT GtkWindow
- #define ACCEL_OBJECTS(a) (a)->acceleratables
- #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
-#else // GTK+ 1.x
- #define ACCEL_OBJECT GtkObject
- #define ACCEL_OBJECTS(a) (a)->attach_objects
- #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
+#include <gdk/gdktypes.h>
#endif
+// FIXME: is this right? somehow I don't think so (VZ)
+
+#define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
+//#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
+//#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
+
+#define ACCEL_OBJECT GtkWindow
+#define ACCEL_OBJECTS(a) (a)->acceleratables
+#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
+
// we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3;
}
}
+void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
+{
+ if ( dir == wxLayout_Default )
+ {
+ const wxWindow *const frame = GetFrame();
+ if ( frame )
+ {
+ // inherit layout from frame.
+ dir = frame->GetLayoutDirection();
+ }
+ else // use global layout
+ {
+ dir = wxTheApp->GetLayoutDirection();
+ }
+ }
+
+ if ( dir == wxLayout_Default )
+ return;
+
+ GTKSetLayout(m_menubar, dir);
+
+ // also set the layout of all menus we already have (new ones will inherit
+ // the current layout)
+ for ( wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxMenu *const menu = node->GetData();
+ menu->SetLayoutDirection(dir);
+ }
+}
+
+wxLayoutDirection wxMenuBar::GetLayoutDirection() const
+{
+ return GTKGetLayout(m_menubar);
+}
+
+void wxMenuBar::Attach(wxFrame *frame)
+{
+ wxMenuBarBase::Attach(frame);
+
+ SetLayoutDirection(wxLayout_Default);
+}
+
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
m_invokingWindow = (wxWindow*) NULL;
// The "m_owner" is the "menu item"
menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+ menu->SetLayoutDirection(GetLayoutDirection());
gtk_widget_show( menu->m_owner );
void wxMenuItem::SetText( const wxString& str )
{
+ // cache some data which must be used later
+ bool isstock = wxIsStockID(GetId());
+ const char *stockid = NULL;
+ if (isstock)
+ stockid = wxGetStockGtkID(GetId());
+
// Some optimization to avoid flicker
wxString oldLabel = m_text;
oldLabel = wxStripMenuCodes(oldLabel);
DoSetText(str);
if (oldLabel == label1 &&
- oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered
+ oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered
return;
if (m_menuItem)
else
label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
- gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(m_text) );
+ // stock menu items can have empty labels:
+ wxString text = m_text;
+ if (text.IsEmpty() && !IsSeparator())
+ {
+ wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
+ text = wxGetStockLabel(GetId());
+
+ // need & => _ conversion
+ text = GTKProcessMenuItemLabel(text, NULL);
+ }
+
+ gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) );
}
+ // remove old accelerator from our parent's accelerator group, if present
guint accel_key;
GdkModifierType accel_mods;
- gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
- if (accel_key != 0)
+ if (oldbuf[(size_t)0] != '\0')
{
- gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
- m_parentMenu->m_accel,
- accel_key,
- accel_mods );
+ gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
+ }
+ }
+ else if (isstock)
+ {
+ // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+ if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+ gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
}
+ // add new accelerator to our parent's accelerator group
wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );
- gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
- if (accel_key != 0)
+ if (buf[(size_t)0] != '\0')
{
- gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem),
- "activate",
- m_parentMenu->m_accel,
- accel_key,
- accel_mods,
- GTK_ACCEL_VISIBLE);
+ gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem),
+ "activate",
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
+ }
+ }
+ else if (isstock)
+ {
+ // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+ if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+ gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
}
}
-// it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::DoSetText( const wxString& str )
+// NOTE: this function is different from the similar functions GTKProcessMnemonics()
+// implemented in control.cpp and from wxMenuItemBase::GetLabelFromText...
+// so there's no real code duplication
+wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey)
{
+ wxString text;
+
// '\t' is the deliminator indicating a hot key
- m_text.Empty();
const wxChar *pc = str;
while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
{
{
// "&" is doubled to indicate "&" instead of accelerator
++pc;
- m_text << wxT('&');
+ text << wxT('&');
}
else if (*pc == wxT('&'))
{
- m_text << wxT('_');
+ text << wxT('_');
}
else if ( *pc == wxT('_') ) // escape underscores
{
- m_text << wxT("__");
+ text << wxT("__");
}
else
{
- m_text << *pc;
+ text << *pc;
}
++pc;
}
- m_hotKey = wxT("");
-
- if(*pc == wxT('\t'))
+ if (hotKey)
{
- pc++;
- m_hotKey = pc;
+ hotKey->Empty();
+ if(*pc == wxT('\t'))
+ {
+ pc++;
+ *hotKey = pc;
+ }
}
- // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() );
+ return text;
+}
+
+// it's valid for this function to be called even if m_menuItem == NULL
+void wxMenuItem::DoSetText( const wxString& str )
+{
+ m_text.Empty();
+ m_text = GTKProcessMenuItemLabel(str, &m_hotKey);
}
#if wxUSE_ACCEL
if ( !GetHotKey() )
{
// nothing
- return (wxAcceleratorEntry *)NULL;
+ return NULL;
}
- // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+ // accelerator parsing code looks for them after a TAB, so insert a dummy
+ // one here
wxString label;
label << wxT('\t') << GetHotKey();
- return wxGetAccelFromString(label);
+ return wxAcceleratorEntry::Create(label);
}
#endif // wxUSE_ACCEL
}
}
+void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
+{
+ if ( m_owner )
+ wxWindow::GTKSetLayout(m_owner, dir);
+ //else: will be called later by wxMenuBar again
+}
+
+wxLayoutDirection wxMenu::GetLayoutDirection() const
+{
+ return wxWindow::GTKGetLayout(m_owner);
+}
+
bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
{
GtkWidget *menuItem;
- wxString text;
+ // cache some data used later
+ wxString text = mitem->GetText();
+ int id = mitem->GetId();
+ bool isstock = wxIsStockID(id);
+ const char *stockid = NULL;
+ if (isstock)
+ stockid = wxGetStockGtkID(mitem->GetId());
+
+ // stock menu items can have an empty label
+ if (text.IsEmpty() && !mitem->IsSeparator())
+ {
+ wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
+ text = wxGetStockLabel(id);
+
+ // need & => _ conversion
+ text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL);
+ }
if ( mitem->IsSeparator() )
{
menuItem = gtk_separator_menu_item_new();
}
- else if (mitem->GetBitmap().Ok())
+ else if ( mitem->GetBitmap().Ok() ||
+ (mitem->GetKind() == wxITEM_NORMAL && isstock) )
{
- text = mitem->GetText();
- const wxBitmap *bitmap = &mitem->GetBitmap();
+ wxBitmap bitmap(mitem->GetBitmap());
menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
GtkWidget *image;
- if (bitmap->HasPixbuf())
+ if ( !bitmap.Ok() )
{
- image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+ // use stock bitmap for this item if available on the assumption
+ // that it never hurts to follow GTK+ conventions more closely
+ image = stockid ? gtk_image_new_from_stock(stockid, GTK_ICON_SIZE_MENU)
+ : NULL;
}
- else
+ else // we have a custom bitmap
{
- GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
- GdkBitmap *gdk_bitmap = bitmap->GetMask() ?
- bitmap->GetMask()->GetBitmap() :
- (GdkBitmap*) NULL;
- image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
+ wxASSERT_MSG( mitem->GetKind() == wxITEM_NORMAL,
+ _T("only normal menu items can have bitmaps") );
+
+ if ( bitmap.HasPixbuf() )
+ {
+ image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
+ }
+ else
+ {
+ GdkPixmap *gdk_pixmap = bitmap.GetPixmap();
+ GdkBitmap *gdk_bitmap = bitmap.GetMask() ?
+ bitmap.GetMask()->GetBitmap() :
+ (GdkBitmap*) NULL;
+ image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
+ }
}
- gtk_widget_show(image);
+ if ( image )
+ {
+ gtk_widget_show(image);
- gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
+ }
m_prevRadio = NULL;
}
else // a normal item
{
- // text has "_" instead of "&" after mitem->SetText() so don't use it
- text = mitem->GetText() ;
+ // NB: 'text' variable has "_" instead of "&" after mitem->SetText()
+ // so don't use it
switch ( mitem->GetKind() )
{
wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
// wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() );
- gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
- if (accel_key != 0)
+ if (buf[(size_t)0] != '\0')
{
- gtk_widget_add_accelerator (GTK_WIDGET(menuItem),
- "activate",
- m_accel,
- accel_key,
- accel_mods,
- GTK_ACCEL_VISIBLE);
+ gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_add_accelerator (GTK_WIDGET(menuItem),
+ "activate",
+ m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
+ }
+ }
+ else if (isstock)
+ {
+ // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+ if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+ gtk_widget_add_accelerator( GTK_WIDGET(menuItem),
+ "activate",
+ m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
}
if (pos == -1)
return wxNOT_FOUND;
}
+void wxMenu::Attach(wxMenuBarBase *menubar)
+{
+ wxMenuBase::Attach(menubar);
+
+ // inherit layout direction from menubar.
+ SetLayoutDirection(menubar->GetLayoutDirection());
+}
+
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------
hotkey << wxT("Down" );
break;
case WXK_PAGEUP:
- hotkey << wxT("PgUp" );
+ hotkey << wxT("Page_Up" );
break;
case WXK_PAGEDOWN:
- hotkey << wxT("PgDn" );
+ hotkey << wxT("Page_Down" );
break;
case WXK_LEFT:
hotkey << wxT("Left" );
hotkey << wxT("KP_Down" );
break;
case WXK_NUMPAD_PAGEUP:
- hotkey << wxT("KP_PgUp" );
+ hotkey << wxT("KP_Page_Up" );
break;
case WXK_NUMPAD_PAGEDOWN:
- hotkey << wxT("KP_PgDn" );
+ hotkey << wxT("KP_Page_Down" );
break;
case WXK_NUMPAD_END:
hotkey << wxT("KP_End" );
hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
break;
*/
- // if there are any other keys wxGetAccelFromString() may
+ // if there are any other keys wxAcceleratorEntry::Create() may
// return, we should process them here
default:
if ( code < 127 )
{
- wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
- if ( name )
+ const wxString
+ name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code));
+ if ( !name.empty() )
{
hotkey << name;
break;
}
#endif // wxUSE_MENUS_NATIVE
+
+#ifdef __WXGTK20__
+
+#include <gtk/gtk.h>
+
+const char *wxGetStockGtkID(wxWindowID id)
+{
+ #define STOCKITEM(wx,gtk) \
+ case wx: \
+ return gtk;
+
+ #define STOCKITEM_MISSING(wx) \
+ case wx: \
+ return NULL;
+
+ #if GTK_CHECK_VERSION(2,4,0)
+ #define STOCKITEM_24(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx)
+ #endif
+
+ #if GTK_CHECK_VERSION(2,6,0)
+ #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_26(wx,gtk) STOCKITEM_MISSING(wx)
+ #endif
+
+ #if GTK_CHECK_VERSION(2,10,0)
+ #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_210(wx,gtk) STOCKITEM_MISSING(wx)
+ #endif
+
+
+ switch (id)
+ {
+ STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT)
+ STOCKITEM(wxID_ADD, GTK_STOCK_ADD)
+ STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY)
+ STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD)
+ STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL)
+ STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR)
+ STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE)
+ STOCKITEM(wxID_COPY, GTK_STOCK_COPY)
+ STOCKITEM(wxID_CUT, GTK_STOCK_CUT)
+ STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE)
+ STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT)
+ STOCKITEM(wxID_FIND, GTK_STOCK_FIND)
+ STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE)
+ STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
+ STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK)
+ STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN)
+ STOCKITEM(wxID_FORWARD, GTK_STOCK_GO_FORWARD)
+ STOCKITEM(wxID_UP, GTK_STOCK_GO_UP)
+ STOCKITEM(wxID_HELP, GTK_STOCK_HELP)
+ STOCKITEM(wxID_HOME, GTK_STOCK_HOME)
+ STOCKITEM_24(wxID_INDENT, GTK_STOCK_INDENT)
+ STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX)
+ STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC)
+ STOCKITEM(wxID_JUSTIFY_CENTER, GTK_STOCK_JUSTIFY_CENTER)
+ STOCKITEM(wxID_JUSTIFY_FILL, GTK_STOCK_JUSTIFY_FILL)
+ STOCKITEM(wxID_JUSTIFY_LEFT, GTK_STOCK_JUSTIFY_LEFT)
+ STOCKITEM(wxID_JUSTIFY_RIGHT, GTK_STOCK_JUSTIFY_RIGHT)
+ STOCKITEM(wxID_NEW, GTK_STOCK_NEW)
+ STOCKITEM(wxID_NO, GTK_STOCK_NO)
+ STOCKITEM(wxID_OK, GTK_STOCK_OK)
+ STOCKITEM(wxID_OPEN, GTK_STOCK_OPEN)
+ STOCKITEM(wxID_PASTE, GTK_STOCK_PASTE)
+ STOCKITEM(wxID_PREFERENCES, GTK_STOCK_PREFERENCES)
+ STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT)
+ STOCKITEM(wxID_PREVIEW, GTK_STOCK_PRINT_PREVIEW)
+ STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES)
+ STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT)
+ STOCKITEM(wxID_REDO, GTK_STOCK_REDO)
+ STOCKITEM(wxID_REFRESH, GTK_STOCK_REFRESH)
+ STOCKITEM(wxID_REMOVE, GTK_STOCK_REMOVE)
+ STOCKITEM(wxID_REVERT_TO_SAVED, GTK_STOCK_REVERT_TO_SAVED)
+ STOCKITEM(wxID_SAVE, GTK_STOCK_SAVE)
+ STOCKITEM(wxID_SAVEAS, GTK_STOCK_SAVE_AS)
+ STOCKITEM_210(wxID_SELECTALL, GTK_STOCK_SELECT_ALL)
+ STOCKITEM(wxID_STOP, GTK_STOCK_STOP)
+ STOCKITEM(wxID_UNDELETE, GTK_STOCK_UNDELETE)
+ STOCKITEM(wxID_UNDERLINE, GTK_STOCK_UNDERLINE)
+ STOCKITEM(wxID_UNDO, GTK_STOCK_UNDO)
+ STOCKITEM_24(wxID_UNINDENT, GTK_STOCK_UNINDENT)
+ STOCKITEM(wxID_YES, GTK_STOCK_YES)
+ STOCKITEM(wxID_ZOOM_100, GTK_STOCK_ZOOM_100)
+ STOCKITEM(wxID_ZOOM_FIT, GTK_STOCK_ZOOM_FIT)
+ STOCKITEM(wxID_ZOOM_IN, GTK_STOCK_ZOOM_IN)
+ STOCKITEM(wxID_ZOOM_OUT, GTK_STOCK_ZOOM_OUT)
+
+ default:
+ wxFAIL_MSG( _T("invalid stock item ID") );
+ break;
+ };
+
+ #undef STOCKITEM
+
+ return NULL;
+}
+
+bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
+{
+ if (!id)
+ return false;
+
+ GtkStockItem stock_item;
+ if (gtk_stock_lookup (id, &stock_item))
+ {
+ if (key) *key = stock_item.keyval;
+ if (mod) *mod = stock_item.modifier;
+
+ // some GTK stock items have zero values for the keyval;
+ // it means that they do not have an accelerator...
+ if (stock_item.keyval)
+ return true;
+ }
+
+ return false;
+}
+
+#endif // __WXGTK20__
projects / wxWidgets.git / blobdiff