#pragma hdrstop
#endif
+#include "wx/frame.h"
+
#ifndef WX_PRECOMP
- #include "wx/frame.h"
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/app.h"
#include "wx/menu.h"
#include "wx/utils.h"
#include "wx/dcclient.h"
#include "wx/mdi.h"
#include "wx/panel.h"
+ #include "wx/log.h"
+ #include "wx/toolbar.h"
+ #include "wx/statusbr.h"
+ #include "wx/menuitem.h"
#endif // WX_PRECOMP
#include "wx/msw/private.h"
-#ifdef __WXWINCE__
-#include <commctrl.h>
-#endif
-
#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
#include <ole2.h>
#include <aygshell.h>
#include "wx/msw/winundef.h"
#endif
-#if wxUSE_STATUSBAR
- #include "wx/statusbr.h"
- #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
- #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
-#include "wx/menuitem.h"
-#include "wx/log.h"
+#include "wx/generic/statusbr.h"
#ifdef __WXUNIVERSAL__
#include "wx/univ/theme.h"
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxFrameStyle )
-
-wxBEGIN_FLAGS( wxFrameStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- // frame styles
- wxFLAGS_MEMBER(wxSTAY_ON_TOP)
- wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
- wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
- wxFLAGS_MEMBER(wxSYSTEM_MENU)
- wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
- wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
- wxFLAGS_MEMBER(wxCLOSE_BOX)
- wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
- wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-
- wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
- wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
-
- wxFLAGS_MEMBER(wxFRAME_SHAPED)
-
-wxEND_FLAGS( wxFrameStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxFrame)
- wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
-
- wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
- wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxFrame)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
-
// ============================================================================
// implementation
// ============================================================================
wxFrame::~wxFrame()
{
- m_isBeingDeleted = true;
+ SendDestroyEvent();
+
DeleteAllBars();
}
width += pt.x;
height += pt.y;
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar )
+ {
+ if ( toolbar->HasFlag(wxTB_RIGHT | wxTB_BOTTOM) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+ if ( toolbar->HasFlag(wxTB_RIGHT) )
+ width -= sizeTB.x;
+ else // wxTB_BOTTOM
+ height -= sizeTB.y;
+ }
+ //else: toolbar already taken into account by GetClientAreaOrigin()
+ }
+#endif // wxUSE_TOOLBAR
+
wxTopLevelWindow::DoSetClientSize(width, height);
}
if ( y )
*y -= pt.y;
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar )
+ {
+ if ( toolbar->HasFlag(wxTB_RIGHT | wxTB_BOTTOM) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+ if ( toolbar->HasFlag(wxTB_RIGHT) )
+ {
+ if ( x )
+ *x -= sizeTB.x;
+ }
+ else // wxTB_BOTTOM
+ {
+ if ( y )
+ *y -= sizeTB.y;
+ }
+ }
+ //else: toolbar already taken into account by GetClientAreaOrigin()
+ }
+#endif // wxUSE_TOOLBAR
+
#if wxUSE_STATUSBAR
// adjust client area height to take the status bar into account
if ( y )
wxStatusBar *statbar = GetStatusBar();
if ( statbar && statbar->IsShown() )
{
- *y -= statbar->GetClientSize().y;
+ *y -= statbar->GetSize().y;
}
}
#endif // wxUSE_STATUSBAR
}
// generate an artificial resize event
-void wxFrame::SendSizeEvent()
+void wxFrame::SendSizeEvent(int flags)
{
if ( !m_iconized )
{
RECT r = wxGetWindowRect(GetHwnd());
- (void)::PostMessage(GetHwnd(), WM_SIZE,
- IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
- MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ if ( flags & wxSEND_EVENT_POST )
+ {
+ ::PostMessage(GetHwnd(), WM_SIZE,
+ IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+ MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ }
+ else // send it
+ {
+ ::SendMessage(GetHwnd(), WM_SIZE,
+ IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+ MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ }
}
}
int w, h;
GetClientSize(&w, &h);
+
int sw, sh;
m_frameStatusBar->GetSize(&sw, &sh);
+ int x = 0;
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar && !toolbar->HasFlag(wxTB_TOP) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+
+ if ( toolbar->HasFlag(wxTB_LEFT | wxTB_RIGHT) )
+ {
+ if ( toolbar->HasFlag(wxTB_LEFT) )
+ x -= sizeTB.x;
+
+ w += sizeTB.x;
+ }
+ else // wxTB_BOTTOM
+ {
+ // we need to position the status bar below the toolbar
+ h += sizeTB.y;
+ }
+ }
+ //else: no adjustments necessary for the toolbar on top
+#endif // wxUSE_TOOLBAR
+
// Since we wish the status bar to be directly under the client area,
// we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
- m_frameStatusBar->SetSize(0, h, w, sh);
+ m_frameStatusBar->SetSize(x, h, w, sh);
}
+
#endif // wxUSE_STATUSBAR
#if wxUSE_MENUS_NATIVE
if( menubar->GetMenuCount() == 1 )
{
autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
- SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu);
+ SetRightMenu(wxID_ANY, menubar->GetMenuLabel(0), autoMenu);
}
else
{
for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
{
wxMenu *item = menubar->GetMenu(n);
- wxString label = menubar->GetLabelTop(n);
+ wxString label = menubar->GetMenuLabel(n);
wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
autoMenu->Append(wxID_ANY, label, new_item);
}
SetToolBar(toolBar);
menubar->SetToolBar(toolBar);
}
- // Now adjust size for menu bar
- int menuHeight = 26;
- //When the main window is created using CW_USEDEFAULT the height of the
- // is created is not taken into account). So we resize the window after
- // if a menubar is present
+ // When the main window is created using CW_USEDEFAULT the height of the
+ // menubar is not taken into account, so we resize it afterwards if a
+ // menubar is present
+ HWND hwndMenuBar = SHFindMenuBar(GetHwnd());
+ if ( hwndMenuBar )
{
+ RECT mbRect;
+ ::GetWindowRect(hwndMenuBar, &mbRect);
+ const int menuHeight = mbRect.bottom - mbRect.top;
+
RECT rc;
- ::GetWindowRect((HWND) GetHWND(), &rc);
+ ::GetWindowRect(GetHwnd(), &rc);
// adjust for menu / titlebar height
rc.bottom -= (2*menuHeight-1);
- ::MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
+ ::MoveWindow(Gethwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
}
#endif
if ( !m_hMenu )
{
- wxFAIL_MSG( _T("failed to create menu bar") );
+ wxFAIL_MSG( wxT("failed to create menu bar") );
return;
}
}
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
+ m_frameStatusBar->HandleWindowEvent(event2);
}
#endif // wxUSE_STATUSBAR
}
#endif // wxUSE_TOOLBAR
+#if wxUSE_MENUS
if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
{
- WXHMENU menu = m_hMenu;
-
-#if wxUSE_MDI_ARCHITECTURE
- wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
- if (frame)
- {
- wxMDIChildFrame *child = frame->GetActiveChild();
- if (child)
- {
- menu = child->GetWinMenu();
- }
- }
-#endif // wxUSE_MDI_ARCHITECTURE
-
- if (menu)
- {
- ::SetMenu(GetHwnd(), (HMENU)menu);
- }
+ const WXHMENU hmenu = MSWGetActiveMenu();
+ if ( hmenu )
+ ::SetMenu(GetHwnd(), (HMENU)hmenu);
}
+#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
wxStatusBar *theStatusBar = GetStatusBar();
void wxFrame::PositionToolBar()
{
+ // TODO: we want to do something different in WinCE, because the toolbar
+ // should be associated with the commandbar, instead of being
+ // independent window.
+#if !defined(WINCE_WITHOUT_COMMANDBAR)
wxToolBar *toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() )
{
-#if defined(WINCE_WITHOUT_COMMANDBAR)
- // We want to do something different in WinCE, because
- // the toolbar should be associated with the commandbar,
- // and not an independent window.
- // TODO
-#else
// don't call our (or even wxTopLevelWindow) version because we want
// the real (full) client area size, not excluding the tool/status bar
int width, height;
}
#endif // wxUSE_STATUSBAR
- int x = 0;
- int y = 0;
+ int tx, ty, tw, th;
+ toolbar->GetPosition( &tx, &ty );
+ toolbar->GetSize( &tw, &th );
+
+ int x, y;
+ if ( toolbar->HasFlag(wxTB_BOTTOM) )
+ {
+ x = 0;
+ y = height - th;
+ }
+ else if ( toolbar->HasFlag(wxTB_RIGHT) )
+ {
+ x = width - tw;
+ y = 0;
+ }
+ else // left or top
+ {
+ x = 0;
+ y = 0;
+ }
+
#if defined(WINCE_WITH_COMMANDBAR)
// We're using a commandbar - so we have to allow for it.
if (GetMenuBar() && GetMenuBar()->GetCommandBar())
::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
y = rect.bottom - rect.top;
}
-#endif
-
- int tx, ty;
- int tw, th;
- toolbar->GetPosition(&tx, &ty);
- toolbar->GetSize(&tw, &th);
-
- // Adjust
- if (ty < 0 && (-ty == th))
- ty = 0;
- if (tx < 0 && (-tx == tw))
- tx = 0;
-
- int desiredW = tw;
- int desiredH = th;
+#endif // WINCE_WITH_COMMANDBAR
- if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+ if ( toolbar->HasFlag(wxTB_BOTTOM) )
{
- desiredH = height;
+ if ( ty < 0 && ( -ty == th ) )
+ ty = height - th;
+ if ( tx < 0 && (-tx == tw ) )
+ tx = 0;
}
- else
+ else if ( toolbar->HasFlag(wxTB_RIGHT) )
{
- desiredW = width;
-// if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
-// desiredW -= 3;
+ if( ty < 0 && ( -ty == th ) )
+ ty = 0;
+ if( tx < 0 && ( -tx == tw ) )
+ tx = width - tw;
+ }
+ else // left or top
+ {
+ if (ty < 0 && (-ty == th))
+ ty = 0;
+ if (tx < 0 && (-tx == tw))
+ tx = 0;
}
- // use the 'real' MSW position here, don't offset relativly to the
- // client area origin
-
- // Optimise such that we don't have to always resize the toolbar
- // when the frame changes, otherwise we'll get a lot of flicker.
- bool heightChanging wxDUMMY_INITIALIZE(true);
- bool widthChanging wxDUMMY_INITIALIZE(true);
+ int desiredW,
+ desiredH;
- if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+ if ( toolbar->IsVertical() )
{
- // It's OK if the current height is greater than what can be shown.
- heightChanging = (desiredH > th) ;
- widthChanging = (desiredW != tw) ;
-
- // The next time around, we may not have to set the size
- if (heightChanging)
- desiredH = desiredH + 200;
+ desiredW = tw;
+ desiredH = height;
}
else
{
- // It's OK if the current width is greater than what can be shown.
- widthChanging = (desiredW > tw) ;
- heightChanging = (desiredH != th) ;
-
- // The next time around, we may not have to set the size
- if (widthChanging)
- desiredW = desiredW + 200;
+ desiredW = width;
+ desiredH = th;
}
- if (tx != 0 || ty != 0 || widthChanging || heightChanging)
- toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+ // use the 'real' MSW position here, don't offset relatively to the
+ // client area origin
+ toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
-#endif // __WXWINCE__
}
+#endif // !WINCE_WITH_COMMANDBAR
}
#endif // wxUSE_TOOLBAR
return true;
#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
- // try the menu bar accels
+ // try the menu bar accelerators
wxMenuBar *menuBar = GetMenuBar();
- if ( menuBar )
- {
- const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
- return acceleratorTable.Translate(frame, pMsg);
- }
+ if ( menuBar && menuBar->GetAcceleratorTable()->Translate(frame, pMsg) )
+ return true;
#endif // wxUSE_MENUS && wxUSE_ACCEL
return false;
// our private (non virtual) message handlers
// ---------------------------------------------------------------------------
-bool wxFrame::HandlePaint()
-{
- RECT rect;
- if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) )
- {
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
- if ( m_iconized )
- {
- const wxIcon& icon = GetIcon();
- HICON hIcon = icon.Ok() ? GetHiconOf(icon)
- : (HICON)GetDefaultIcon();
-
- // Hold a pointer to the dc so long as the OnPaint() message
- // is being processed
- PAINTSTRUCT ps;
- HDC hdc = ::BeginPaint(GetHwnd(), &ps);
-
- // Erase background before painting or we get white background
- MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
-
- if ( hIcon )
- {
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
-
- // FIXME: why hardcoded?
- static const int icon_width = 32;
- static const int icon_height = 32;
-
- int icon_x = (int)((rect.right - icon_width)/2);
- int icon_y = (int)((rect.bottom - icon_height)/2);
-
- ::DrawIcon(hdc, icon_x, icon_y, hIcon);
- }
-
- ::EndPaint(GetHwnd(), &ps);
-
- return true;
- }
- else
- #endif
- {
- return wxWindow::HandlePaint();
- }
- }
- else
- {
- // nothing to paint - processed
- return true;
- }
-}
-
bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
{
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
- if ( control )
- {
- // In case it's e.g. a toolbar.
- wxWindow *win = wxFindWinFromHandle(control);
- if ( win )
- return win->MSWCommand(cmd, id);
- }
+#if wxUSE_MENUS
+
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (GetToolBar() && GetToolBar()->FindById(id))
+ return GetToolBar()->MSWCommand(cmd, id);
+#endif
- // handle here commands from menus and accelerators
- if ( cmd == 0 || cmd == 1 )
+ // we only need to handle the menu and accelerator commands from the items
+ // of our menu bar, base wxWindow class already handles the rest
+ if ( !control && (cmd == 0 /* menu */ || cmd == 1 /* accel */) )
{
#if wxUSE_MENUS_NATIVE
- if ( wxCurrentPopupMenu )
- {
- wxMenu *popupMenu = wxCurrentPopupMenu;
- wxCurrentPopupMenu = NULL;
-
- return popupMenu->MSWCommand(cmd, id);
- }
+ if ( !wxCurrentPopupMenu )
#endif // wxUSE_MENUS_NATIVE
-
-#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
- // handle here commands from Smartphone menu bar
- if ( wxTopLevelWindow::HandleCommand(id, cmd, control ) )
- {
- return true;
- }
-#endif // __SMARTPHONE__ && __WXWINCE__
-
- if ( ProcessCommand(id) )
{
- return true;
+ wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);
+ if ( mitem )
+ return ProcessCommand(mitem);
}
}
+#endif // wxUSE_MENUS
- return false;
+ return wxFrameBase::HandleCommand(id, cmd, control);;
}
-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+#if wxUSE_MENUS
+
+bool
+wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU WXUNUSED(hMenu))
{
- int item;
- if ( flags == 0xFFFF && hMenu == 0 )
- {
- // menu was removed from screen
- item = -1;
- }
-#ifndef __WXMICROWIN__
- else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
- {
- item = nItem;
- }
-#endif
- else
- {
- // don't give hints for separators (doesn't make sense) nor for the
- // items opening popup menus (they don't have them anyhow) but do clear
- // the status line - otherwise, we would be left with the help message
- // for the previous item which doesn't apply any more
- DoGiveHelp(wxEmptyString, false);
+ // sign extend to int from unsigned short we get from Windows
+ int item = (signed short)nItem;
- return false;
- }
+ // WM_MENUSELECT is generated for both normal items and menus, including
+ // the top level menus of the menu bar, which can't be represented using
+ // any valid identifier in wxMenuEvent so use an otherwise unused value for
+ // them
+ if ( flags & (MF_POPUP | MF_SEPARATOR) )
+ item = wxID_NONE;
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
event.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(event);
+ if ( HandleWindowEvent(event) )
+ return true;
+
+ // by default, i.e. if the event wasn't handled above, clear the status bar
+ // text when an item which can't have any associated help string in wx API
+ // is selected
+ if ( item == wxID_NONE )
+ DoGiveHelp(wxEmptyString, true);
+
+ return false;
}
bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
wxMenuEvent event(evtType, isPopup ? -1 : 0);
event.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
+}
+
+bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
+{
+ wxMenu* menu = NULL;
+ if (GetMenuBar())
+ {
+ menu = GetMenuBar()->MSWGetMenu(hMenu);
+ }
+
+ wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
+ event.SetEventObject(this);
+
+ return HandleWindowEvent(event);
}
+#endif // wxUSE_MENUS
+
// ---------------------------------------------------------------------------
// the window proc for wxFrame
// ---------------------------------------------------------------------------
UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
&id, &hwnd, &cmd);
- processed = HandleCommand(id, cmd, (WXHWND)hwnd);
- }
- break;
+ HandleCommand(id, cmd, (WXHWND)hwnd);
- case WM_PAINT:
- processed = HandlePaint();
+ // don't pass WM_COMMAND to the base class whether we processed
+ // it or not because we did generate an event for it (our
+ // HandleCommand() calls the base class version) and we must
+ // not do it again or the handlers which skip the event would
+ // be called twice
+ processed = true;
+ }
break;
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if wxUSE_MENUS
case WM_INITMENUPOPUP:
processed = HandleInitMenuPopup((WXHMENU) wParam);
break;
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
case WM_MENUSELECT:
{
WXWORD item, flags;
case WM_EXITMENULOOP:
processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);
break;
+#endif // wxUSE_MENUS
case WM_QUERYDRAGICON:
{
const wxIcon& icon = GetIcon();
HICON hIcon = icon.Ok() ? GetHiconOf(icon)
: (HICON)GetDefaultIcon();
- rc = (long)hIcon;
+ rc = (WXLRESULT)hIcon;
processed = rc != 0;
}
break;
return rc;
}
-// handle WM_INITMENUPOPUP message
-bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
-{
- wxMenu* menu = NULL;
- if (GetMenuBar())
- {
- int nCount = GetMenuBar()->GetMenuCount();
- for (int n = 0; n < nCount; n++)
- {
- if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
- {
- menu = GetMenuBar()->GetMenu(n);
- break;
- }
- }
- }
-
- wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
- event.SetEventObject(this);
-
- return GetEventHandler()->ProcessEvent(event);
-}
-
// ----------------------------------------------------------------------------
// wxFrame size management: we exclude the areas taken by menu/status/toolbars
// from the client area, so the client area is what's really available for the
#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
(!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
- wxToolBar *toolbar = GetToolBar();
+ wxToolBar * const toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() )
{
- int w, h;
- toolbar->GetSize(&w, &h);
+ const wxSize sizeTB = toolbar->GetSize();
- if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+ if ( toolbar->HasFlag(wxTB_TOP) )
{
- pt.x += w;
+ pt.y += sizeTB.y;
}
- else
+ else if ( toolbar->HasFlag(wxTB_LEFT) )
{
- pt.y += h;
+ pt.x += sizeTB.x;
}
}
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff