X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89c7e9622933c3ee7906c39bc3927a7d5616b94b..8aa04e8bf1638ed4d9355e560c8d718c8be4667a:/src/motif/window.cpp diff --git a/src/motif/window.cpp b/src/motif/window.cpp index b17a7515ba..dc47a226d6 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -52,7 +52,7 @@ void wxCanvasRepaintProc (Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs); void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs); void wxCanvasMotionEvent (Widget, XButtonEvent * event); void wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event); -void wxScrollBarCallback(Widget widget, XtPointer clientData, +static void wxScrollBarCallback(Widget widget, XtPointer clientData, XmScaleCallbackStruct *cbs); void wxPanelItemEventHandler (Widget wid, XtPointer client_data, @@ -108,6 +108,8 @@ wxWindow::wxWindow() #if wxUSE_DRAG_AND_DROP m_pDropTarget = NULL; #endif + m_clientObject = (wxClientData*) NULL; + m_clientData = NULL; /// Motif-specific m_mainWidget = (WXWidget) 0; @@ -133,7 +135,6 @@ wxWindow::wxWindow() m_canAddEventHandler = FALSE; m_scrollPosX = 0; m_scrollPosY = 0; - m_paintRegion = (WXRegion) 0; } // Destructor @@ -141,10 +142,6 @@ wxWindow::~wxWindow() { //// Motif-specific - if (m_paintRegion) - XDestroyRegion ((Region) m_paintRegion); - m_paintRegion = (WXRegion) 0; - if (GetMainWidget()) DetachWidget(GetMainWidget()); // Removes event handlers @@ -239,8 +236,10 @@ wxWindow::~wxWindow() // dangling pointers. wxPendingDelete.DeleteObject(this); - if ( m_windowValidator ) - delete m_windowValidator; + if ( m_windowValidator ) delete m_windowValidator; + if (m_clientObject) delete m_clientObject; + + ClearUpdateRects(); } // Destroy the window (delayed, if a managed window) @@ -282,6 +281,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, m_maxSizeY = -1; m_defaultItem = NULL; m_windowParent = NULL; + m_clientObject = (wxClientData*) NULL; + m_clientData = NULL; // Motif-specific m_canAddEventHandler = FALSE; @@ -305,7 +306,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, m_pixmapOffsetY = 0; m_scrollPosX = 0; m_scrollPosY = 0; - m_paintRegion = (WXRegion) 0; if (!parent) return FALSE; @@ -475,6 +475,9 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, if (m_vScrollBar) XtRealizeWidget ((Widget) m_vScrollBar); + // Without this, the cursor may not be restored properly + // (e.g. in splitter sample). + SetCursor(*wxSTANDARD_CURSOR); SetSize(pos.x, pos.y, size.x, size.y); return TRUE; @@ -584,15 +587,26 @@ void wxWindow::GetSize(int *x, int *y) const void wxWindow::GetPosition(int *x, int *y) const { - if (m_drawingArea) - { - CanvasGetPosition(x, y); - return; - } - Widget widget = (Widget) GetTopWidget(); - Position xx, yy; - XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL); - *x = xx; *y = yy; + if (m_drawingArea) + { + CanvasGetPosition(x, y); + return; + } + Widget widget = (Widget) GetTopWidget(); + Position xx, yy; + XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL); + + // We may be faking the client origin. + // So a window that's really at (0, 30) may appear + // (to wxWin apps) to be at (0, 0). + if (GetParent()) + { + wxPoint pt(GetParent()->GetClientAreaOrigin()); + xx -= pt.x; + yy -= pt.y; + } + + *x = xx; *y = yy; } void wxWindow::ScreenToClient(int *x, int *y) const @@ -660,10 +674,13 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags) if (managed) XtUnmanageChild(widget); + int xx = x; int yy = y; + AdjustForParentClientOrigin(xx, yy, sizeFlags); + if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - XtVaSetValues(widget, XmNx, x, NULL); + XtVaSetValues(widget, XmNx, xx, NULL); if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - XtVaSetValues(widget, XmNy, y, NULL); + XtVaSetValues(widget, XmNy, yy, NULL); if (width > -1) XtVaSetValues(widget, XmNwidth, width, NULL); if (height > -1) @@ -723,6 +740,8 @@ bool wxWindow::Show(bool show) { if (m_borderWidget || m_scrolledWindow) { + if (m_drawingArea) + XtMapWidget((Widget) m_drawingArea); XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); } else @@ -734,6 +753,8 @@ bool wxWindow::Show(bool show) { if (m_borderWidget || m_scrolledWindow) { + if (m_drawingArea) + XtUnmapWidget((Widget) m_drawingArea); XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); } else @@ -1263,23 +1284,6 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect) } } -void wxWindow::SetFont(const wxFont& font) -{ - m_windowFont = font; - - // Note that this causes the widget to be resized back - // to its original size! How can we stop that? - /* - Widget w = (Widget) GetLabelWidget(); // Usually the main widget - if (w && m_windowFont.Ok()) - { - XtVaSetValues (w, - XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)), - NULL); - } - */ -} - void wxWindow::OnChar(wxKeyEvent& event) { if ( event.KeyCode() == WXK_TAB ) { @@ -1387,7 +1391,18 @@ void wxWindow::RemoveChild(wxWindow *child) void wxWindow::DestroyChildren() { - if (GetChildren()) { + if (GetChildren()) + { + wxNode *node = GetChildren()->First(); + while (node) + { + wxNode* next = node->Next(); + wxWindow* child = (wxWindow*) node->Data(); + delete child; + node = next; + } + GetChildren()->Clear(); +#if 0 wxNode *node; while ((node = GetChildren()->First()) != (wxNode *)NULL) { wxWindow *child; @@ -1397,6 +1412,7 @@ void wxWindow::DestroyChildren() delete node; } } /* while */ +#endif } } @@ -1913,6 +1929,27 @@ void wxWindow::SetValidator(const wxValidator& validator) m_windowValidator->SetWindow(this) ; } +void wxWindow::SetClientObject( wxClientData *data ) +{ + if (m_clientObject) delete m_clientObject; + m_clientObject = data; +} + +wxClientData *wxWindow::GetClientObject() +{ + return m_clientObject; +} + +void wxWindow::SetClientData( void *data ) +{ + m_clientData = data; +} + +void *wxWindow::GetClientData() +{ + return m_clientData; +} + // Find a window by id or name wxWindow *wxWindow::FindWindow(long id) { @@ -1950,26 +1987,9 @@ wxWindow *wxWindow::FindWindow(const wxString& name) void wxWindow::OnIdle(wxIdleEvent& event) { -/* TODO: you may need to do something like this - * if your GUI doesn't generate enter/leave events - - // Check if we need to send a LEAVE event - if (m_mouseInWindow) - { - POINT pt; - ::GetCursorPos(&pt); - if (::WindowFromPoint(pt) != (HWND) GetHWND()) - { - // Generate a LEAVE event - m_mouseInWindow = FALSE; - MSWOnMouseLeave(pt.x, pt.y, 0); - } - } -*/ - // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - UpdateWindowUI(); + UpdateWindowUI(); } // Raise the window to the top of the Z order @@ -1992,9 +2012,9 @@ bool wxWindow::AcceptsFocus() const } // Update region access -wxRegion wxWindow::GetUpdateRegion() const +wxRegion& wxWindow::GetUpdateRegion() const { - return m_updateRegion; + return (wxRegion&) m_updateRegion; } bool wxWindow::IsExposed(int x, int y, int w, int h) const @@ -2049,9 +2069,7 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *nu bool wxAddWindowToTable(Widget w, wxWindow *win) { wxWindow *oldItem = NULL; -#if DEBUG // printf("Adding widget %ld, name = %s\n", w, win->GetClassInfo()->GetClassName()); -#endif if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w))) { char buf[300]; @@ -2113,75 +2131,41 @@ void wxCanvasRepaintProc (Widget drawingArea, XtPointer clientData, XmDrawingAreaCallbackStruct * cbs) { if (!wxWidgetHashTable->Get ((long) (Widget) drawingArea)) - return; + return; XEvent * event = cbs->event; - wxWindow * canvas = (wxWindow *) clientData; - Display * display = (Display *) canvas->GetXDisplay(); - // GC gc = (GC) canvas->GetDC()->gc; + wxWindow * win = (wxWindow *) clientData; + Display * display = (Display *) win->GetXDisplay(); switch (event->type) { - case Expose: - { - /* TODO - wxCanvasDC* canvasDC = canvas->GetDC(); - if (canvasDC) - { - if (canvasDC->onpaint_reg) - XDestroyRegion(canvasDC->onpaint_reg); - canvasDC->onpaint_reg = XCreateRegion(); - - } - */ - - int n = canvas->m_updateRects.Number(); - XRectangle* xrects = new XRectangle[n]; - int i; - for (i = 0; i < canvas->m_updateRects.Number(); i++) - { - wxRect* rect = (wxRect*) canvas->m_updateRects.Nth(i)->Data(); - xrects[i].x = rect->x; - xrects[i].y = rect->y; - xrects[i].width = rect->width; - xrects[i].height = rect->height; - /* TODO (?) Actually ignore it I think. - if (canvasDC) - XUnionRectWithRegion(&(xrects[i]), canvasDC->onpaint_reg, - canvasDC->onpaint_reg); - */ - } - /* TODO must clip the area being repainted. So we need a gc. - * Alternatively, wxPaintDC must do the clipping - * when it's created. - XSetClipRectangles(display, gc, 0, 0, xrects, n, Unsorted); - */ - - canvas->DoPaint() ; // xrects, n); - delete[] xrects; - - canvas->m_updateRects.Clear(); + case Expose: + { + wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y, + event->xexpose.width, event->xexpose.height); + /* + cout << "Expose proc. wxRect: " << rect->x << ", " << rect->y << ", "; + cout << rect->width << ", " << rect->height << "\n\n"; + */ - /* - if (canvasDC) - { - XDestroyRegion(canvasDC->onpaint_reg); - canvasDC->onpaint_reg = NULL; - } + win->m_updateRects.Append((wxObject*) rect); - XGCValues gc_val; - gc_val.clip_mask = None; - XChangeGC(display, gc, GCClipMask, &gc_val); - */ + if (event -> xexpose.count == 0) + { + wxPaintEvent event(win->GetId()); + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); - break; - } - default: - { - cout << "\n\nNew Event ! is = " << event -> type << "\n"; - break; + win->ClearUpdateRects(); + } + break; + } + default: + { + cout << "\n\nNew Event ! is = " << event -> type << "\n"; + break; + } } - } } // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4) @@ -2380,6 +2364,8 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba wxevent.SetId(canvas->GetId()); wxevent.SetEventObject(canvas); + wxevent.m_x = local_event.xbutton.x; + wxevent.m_y = local_event.xbutton.y; canvas->GetEventHandler()->ProcessEvent (wxevent); /* if (eventType == wxEVT_ENTER_WINDOW || @@ -2494,16 +2480,19 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); + int xx = x; int yy = y; + AdjustForParentClientOrigin(xx, yy, sizeFlags); + if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) { XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, - XmNx, x, NULL); + XmNx, xx, NULL); } if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) { XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, - XmNy, y, NULL); + XmNy, yy, NULL); } if (w > -1) @@ -2641,10 +2630,21 @@ void wxWindow::CanvasGetSize (int *w, int *h) const void wxWindow::CanvasGetPosition (int *x, int *y) const { - Position xx, yy; - XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL); - *x = xx; - *y = yy; + Position xx, yy; + XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL); + + // We may be faking the client origin. + // So a window that's really at (0, 30) may appear + // (to wxWin apps) to be at (0, 0). + if (GetParent()) + { + wxPoint pt(GetParent()->GetClientAreaOrigin()); + xx -= pt.x; + yy -= pt.y; + } + + *x = xx; + *y = yy; } // Add to hash table, add event handler @@ -2735,7 +2735,7 @@ void wxPanelItemEventHandler (Widget wid, *continueToDispatch = True; } -void wxScrollBarCallback(Widget scrollbar, XtPointer clientData, +static void wxScrollBarCallback(Widget scrollbar, XtPointer clientData, XmScaleCallbackStruct *cbs) { Widget scrolledWindow = XtParent (scrollbar); @@ -2947,11 +2947,9 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEve return FALSE; } -// TODO From wxWin 1.68. What does it do exactly? #define YAllocColor XAllocColor - -XColor itemColors[5]; -int wxComputeColors (Display *display, wxColour * back, wxColour * fore) +XColor g_itemColors[5]; +int wxComputeColours (Display *display, wxColour * back, wxColour * fore) { int result; static XmColorProc colorProc; @@ -2960,10 +2958,10 @@ int wxComputeColors (Display *display, wxColour * back, wxColour * fore) if (back) { - itemColors[0].red = (((long) back->Red ()) << 8); - itemColors[0].green = (((long) back->Green ()) << 8); - itemColors[0].blue = (((long) back->Blue ()) << 8); - itemColors[0].flags = DoRed | DoGreen | DoBlue; + g_itemColors[0].red = (((long) back->Red ()) << 8); + g_itemColors[0].green = (((long) back->Green ()) << 8); + g_itemColors[0].blue = (((long) back->Blue ()) << 8); + g_itemColors[0].flags = DoRed | DoGreen | DoBlue; if (colorProc == (XmColorProc) NULL) { // Get a ptr to the actual function @@ -2971,19 +2969,19 @@ int wxComputeColors (Display *display, wxColour * back, wxColour * fore) // And set it back to motif. XmSetColorCalculation (colorProc); } - (*colorProc) (&itemColors[wxBACK_INDEX], - &itemColors[wxFORE_INDEX], - &itemColors[wxSELE_INDEX], - &itemColors[wxTOPS_INDEX], - &itemColors[wxBOTS_INDEX]); + (*colorProc) (&g_itemColors[wxBACK_INDEX], + &g_itemColors[wxFORE_INDEX], + &g_itemColors[wxSELE_INDEX], + &g_itemColors[wxTOPS_INDEX], + &g_itemColors[wxBOTS_INDEX]); result = wxBACK_COLORS; } if (fore) { - itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8); - itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8); - itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8); - itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue; + g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8); + g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8); + g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8); + g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue; if (result == wxNO_COLORS) result = wxFORE_COLORS; } @@ -2995,13 +2993,13 @@ int wxComputeColors (Display *display, wxColour * back, wxColour * fore) { /* 5 Colours to allocate */ for (int i = 0; i < 5; i++) - if (!YAllocColor (dpy, cmap, &itemColors[i])) + if (!YAllocColor (dpy, cmap, &g_itemColors[i])) result = wxNO_COLORS; } else if (fore) { /* Only 1 colour to allocate */ - if (!YAllocColor (dpy, cmap, &itemColors[wxFORE_INDEX])) + if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX])) result = wxNO_COLORS; } @@ -3009,58 +3007,176 @@ int wxComputeColors (Display *display, wxColour * back, wxColour * fore) } -void wxWindow::ChangeColour(WXWidget widget) +// Changes the foreground and background colours to be derived +// from the current background colour. +// To change the foreground colour, you must call SetForegroundColour +// explicitly. +void wxWindow::ChangeBackgroundColour() { - // TODO -#if 0 - int change; + if (GetMainWidget()) + DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour); +} + +void wxWindow::ChangeForegroundColour() +{ + if (GetMainWidget()) + DoChangeForegroundColour(GetMainWidget(), m_foregroundColour); +} - // TODO: how to determine whether we can change this item's colours? - // We used to have wxUSER_COLOURS. Now perhaps we assume we always - // can change it. - // if (!(parent->GetWindowStyleFlag() & wxUSER_COLOURS)) - // return; +// Change a widget's foreground and background colours. - change = wxComputeColors (XtDisplay((Widget)widget), panel->GetBackgroundColour(), - panel->GetLabelColour()); - if (change == wxBACK_COLORS) - XtVaSetValues ((Widget) widget, - XmNbackground, itemColors[wxBACK_INDEX].pixel, - XmNtopShadowColor, itemColors[wxTOPS_INDEX].pixel, - XmNbottomShadowColor, itemColors[wxBOTS_INDEX].pixel, - XmNforeground, itemColors[wxFORE_INDEX].pixel, - NULL); - else if (change == wxFORE_COLORS) - XtVaSetValues (formWidget, - XmNforeground, itemColors[wxFORE_INDEX].pixel, - NULL); +void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) +{ + // When should we specify the foreground, if it's calculated + // by wxComputeColours? + // Solution: say we start with the default (computed) foreground colour. + // If we call SetForegroundColour explicitly for a control or window, + // then the foreground is changed. + // Therefore SetBackgroundColour computes the foreground colour, and + // SetForegroundColour changes the foreground colour. The ordering is + // important. - change = wxComputeColors (XtDisplay((Widget)formWidget), GetBackgroundColour(), GetLabelColour()); - if (change == wxBACK_COLORS) - XtVaSetValues (labelWidget, - XmNbackground, itemColors[wxBACK_INDEX].pixel, - XmNtopShadowColor, itemColors[wxTOPS_INDEX].pixel, - XmNbottomShadowColor, itemColors[wxBOTS_INDEX].pixel, - XmNarmColor, itemColors[wxSELE_INDEX].pixel, - XmNforeground, itemColors[wxFORE_INDEX].pixel, + XtVaSetValues ((Widget) widget, + XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)), NULL); - else if (change == wxFORE_COLORS) - XtVaSetValues (labelWidget, - XmNforeground, itemColors[wxFORE_INDEX].pixel, +} + +void wxWindow::DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour) +{ + wxComputeColours (XtDisplay((Widget) widget), & backgroundColour, + (wxColour*) NULL); + + XtVaSetValues ((Widget) widget, + XmNbackground, g_itemColors[wxBACK_INDEX].pixel, + XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel, + XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel, + XmNforeground, g_itemColors[wxFORE_INDEX].pixel, NULL); -#endif + + if (changeArmColour) + XtVaSetValues ((Widget) widget, + XmNarmColor, g_itemColors[wxSELE_INDEX].pixel, + NULL); } -void wxWindow::ChangeFont(WXWidget widget) +void wxWindow::SetBackgroundColour(const wxColour& col) { - /* - if (widget && GetFont() && GetFont()->Ok()) - { - XmFontList fontList = (XmFontList) GetFont()->GetFontList(1.0, GetXDisplay()); - if (fontList) - XtVaSetValues ((Widget) widget, - XmNfontList, fontList, + m_backgroundColour = col; + ChangeBackgroundColour(); +} + +void wxWindow::SetForegroundColour(const wxColour& col) +{ + m_foregroundColour = col; + ChangeForegroundColour(); +} + +void wxWindow::ChangeFont(bool keepOriginalSize) +{ + // Note that this causes the widget to be resized back + // to its original size! We therefore have to set the size + // back again. TODO: a better way in Motif? + Widget w = (Widget) GetLabelWidget(); // Usually the main widget + if (w && m_windowFont.Ok()) + { + int width, height, width1, height1; + GetSize(& width, & height); + + XtVaSetValues (w, + XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)), NULL); - } - */ + + GetSize(& width1, & height1); + if (keepOriginalSize && (width != width1 || height != height1)) + { + SetSize(-1, -1, width, height); + } + } } + +void wxWindow::SetFont(const wxFont& font) +{ + m_windowFont = font; + ChangeFont(); +} + +void wxWindow::ClearUpdateRects() +{ + wxNode* node = m_updateRects.First(); + while (node) + { + wxRect* rect = (wxRect*) node->Data(); + delete rect; + node = node->Next(); + } + m_updateRects.Clear(); +} + +bool wxWindow::ProcessAccelerator(wxKeyEvent& event) +{ + if (!m_acceleratorTable.Ok()) + return FALSE; + + int count = m_acceleratorTable.GetCount(); + wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries(); + int i; + for (i = 0; i < count; i++) + { + wxAcceleratorEntry* entry = & (entries[i]); + if (entry->MatchesEvent(event)) + { + // Bingo, we have a match. Now find a control + // that matches the entry command id. + + // Need to go up to the top of the window hierarchy, + // since it might be e.g. a menu item + wxWindow* parent = this; + while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)) && !parent->IsKindOf(CLASSINFO(wxDialog))) + parent = parent->GetParent(); + + if (!parent) + return FALSE; + + if (parent->IsKindOf(CLASSINFO(wxFrame))) + { + // Try for a menu command + wxFrame* frame = (wxFrame*) parent; + if (frame->GetMenuBar()) + { + wxMenuItem* item = frame->GetMenuBar()->FindItemForId(entry->GetCommand()); + if (item) + { + wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand()); + commandEvent.SetEventObject(frame); + + // If ProcessEvent returns TRUE (it was handled), then + // the calling code will skip the event handling. + return frame->GetEventHandler()->ProcessEvent(commandEvent); + } + } + } + + // Find a child matching the command id + wxWindow* child = parent->FindWindow(entry->GetCommand()); + + // No such child + if (!child) + return FALSE; + + // Now we process those kinds of windows that we can. + // For now, only buttons. + if (child->IsKindOf(CLASSINFO(wxButton))) + { + wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId()); + commandEvent.SetEventObject(child); + return child->GetEventHandler()->ProcessEvent(commandEvent); + } + + return FALSE; + } // matches event + }// for + + // We didn't match the key event against an accelerator. + return FALSE; +} +