/////////////////////////////////////////////////////////////////////////////
-// Name: msw/frame.cpp
+// Name: src/msw/frame.cpp
// Purpose: wxFrame
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "frame.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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>
+#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"
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
// 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)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
wxBEGIN_PROPERTIES_TABLE(wxFrame)
- wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+ 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
wxBEGIN_HANDLERS_TABLE(wxFrame)
wxEND_HANDLERS_TABLE()
-wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
+wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
#else
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
#if wxUSE_STATUSBAR
#if wxUSE_NATIVE_STATUSBAR
- bool wxFrame::m_useNativeStatusBar = TRUE;
+ bool wxFrame::m_useNativeStatusBar = true;
#else
- bool wxFrame::m_useNativeStatusBar = FALSE;
+ bool wxFrame::m_useNativeStatusBar = false;
#endif
#endif // wxUSE_NATIVE_STATUSBAR
void wxFrame::Init()
{
+#if wxUSE_MENUS
+ m_hMenu = NULL;
+#endif // wxUSE_MENUS
+
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
#endif
- // Data to save/restore when calling ShowFullScreen
- m_fsStatusBarFields = 0;
- m_fsStatusBarHeight = 0;
- m_fsToolBarHeight = 0;
-
- m_wasMinimized = FALSE;
+ m_wasMinimized = false;
}
bool wxFrame::Create(wxWindow *parent,
const wxString& name)
{
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
+ return false;
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
- return TRUE;
+#if defined(__SMARTPHONE__)
+ SetLeftMenu(wxID_EXIT, _("Done"));
+#endif
+
+#if wxUSE_ACCEL && defined(__POCKETPC__)
+ // The guidelines state that Ctrl+Q should quit the app.
+ // Let's define an accelerator table to send wxID_EXIT.
+ wxAcceleratorEntry entries[1];
+ entries[0].Set(wxACCEL_CTRL, 'Q', wxID_EXIT);
+ wxAcceleratorTable accel(1, entries);
+ SetAcceleratorTable(accel);
+#endif // wxUSE_ACCEL && __POCKETPC__
+
+ return true;
}
wxFrame::~wxFrame()
{
- m_isBeingDeleted = TRUE;
+ m_isBeingDeleted = true;
DeleteAllBars();
}
if ( y )
*y -= pt.y;
-
+#if wxUSE_TOOLBAR
+ if( y )
+ {
+ wxToolBar *toolbar = GetToolBar();
+ if( toolbar && toolbar->HasFlag( wxTB_BOTTOM ) )
+ {
+ *y -= toolbar->GetClientSize().y;
+ }
+ }
+#endif
#if wxUSE_STATUSBAR
// adjust client area height to take the status bar into account
if ( y )
wxWindowID id,
const wxString& name)
{
- wxStatusBar *statusBar = NULL;
+ wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);
#if wxUSE_NATIVE_STATUSBAR
if ( !UsesNativeStatusBar() )
int w, h;
GetClientSize(&w, &h);
+#if wxUSE_TOOLBAR
+ wxToolBar *toolbar = GetToolBar();
+ if( toolbar && toolbar->HasFlag( wxTB_BOTTOM ) )
+ h += toolbar->GetClientRect().height;
+#endif
int sw, sh;
m_frameStatusBar->GetSize(&sw, &sh);
void wxFrame::AttachMenuBar(wxMenuBar *menubar)
{
-#if defined(WINCE_WITHOUT_COMMANDBAR)
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+
+ wxMenu *autoMenu = NULL;
+
+ if( menubar->GetMenuCount() == 1 )
+ {
+ autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
+ SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu);
+ }
+ else
+ {
+ autoMenu = new wxMenu;
+
+ for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
+ {
+ wxMenu *item = menubar->GetMenu(n);
+ wxString label = menubar->GetLabelTop(n);
+ wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
+ autoMenu->Append(wxID_ANY, label, new_item);
+ }
+
+ SetRightMenu(wxID_ANY, _("Menu"), autoMenu);
+ }
+
+#elif defined(WINCE_WITHOUT_COMMANDBAR)
if (!GetToolBar())
{
- wxToolBar* toolBar = new wxToolBar(this, -1,
+ wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxBORDER_NONE | wxTB_HORIZONTAL,
wxToolBarNameStr, menubar);
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
- {
- RECT rc;
- ::GetWindowRect((HWND) GetHWND(), &rc);
- // adjust for menu / titlebar height
- rc.bottom -= (2*menuHeight-1);
-
- MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
- }
+ // 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
+ {
+ RECT rc;
+ ::GetWindowRect((HWND) GetHWND(), &rc);
+ // adjust for menu / titlebar height
+ rc.bottom -= (2*menuHeight-1);
+
+ ::MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
+ }
#endif
wxFrameBase::AttachMenuBar(menubar);
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
#if wxUSE_STATUSBAR
wxWindow::OnSysColourChanged(event);
}
-// Pass TRUE to show full screen, FALSE to restore.
+// Pass true to show full screen, false to restore.
bool wxFrame::ShowFullScreen(bool show, long style)
{
+ // TODO-CE: add support for CE
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
if ( IsFullScreen() == show )
- return FALSE;
+ return false;
if (show)
{
+ // zap the toolbar, menubar, and statusbar if needed
+ //
+ // TODO: hide commandbar for WINCE_WITH_COMMANDBAR
#if wxUSE_TOOLBAR
-
-#if defined(WINCE_WITH_COMMANDBAR)
- // TODO: hide commandbar
-#else
wxToolBar *theToolBar = GetToolBar();
- if (theToolBar)
- theToolBar->GetSize(NULL, &m_fsToolBarHeight);
-
- // zap the toolbar, menubar, and statusbar
if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
{
- theToolBar->SetSize(-1,0);
- theToolBar->Show(FALSE);
+ if ( theToolBar->IsShown() )
+ {
+ theToolBar->SetSize(wxDefaultCoord,0);
+ theToolBar->Show(false);
+ }
+ else // prevent it from being restored later
+ {
+ style &= ~wxFULLSCREEN_NOTOOLBAR;
+ }
}
-#endif // __WXWINCE__
#endif // wxUSE_TOOLBAR
-#if defined(__WXMICROWIN__)
-#elif defined(__WXWINCE__)
- // TODO: make it work for WinCE
-#else
if (style & wxFULLSCREEN_NOMENUBAR)
SetMenu((HWND)GetHWND(), (HMENU) NULL);
-#endif
#if wxUSE_STATUSBAR
wxStatusBar *theStatusBar = GetStatusBar();
- if (theStatusBar)
- theStatusBar->GetSize(NULL, &m_fsStatusBarHeight);
// Save the number of fields in the statusbar
if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
{
- //m_fsStatusBarFields = theStatusBar->GetFieldsCount();
- //SetStatusBar((wxStatusBar*) NULL);
- //delete theStatusBar;
- theStatusBar->Show(FALSE);
+ if ( theStatusBar->IsShown() )
+ theStatusBar->Show(false);
+ else
+ style &= ~wxFULLSCREEN_NOSTATUSBAR;
}
- else
- m_fsStatusBarFields = 0;
#endif // wxUSE_STATUSBAR
}
- else
+ else // restore to normal
{
+ // restore the toolbar, menubar, and statusbar if we had hid them
#if wxUSE_TOOLBAR
-#if defined(WINCE_WITHOUT_COMMANDBAR)
- // TODO: show commandbar
-#else
wxToolBar *theToolBar = GetToolBar();
- // restore the toolbar, menubar, and statusbar
- if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR))
+ if ((m_fsStyle & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
{
- theToolBar->SetSize(-1, m_fsToolBarHeight);
- theToolBar->Show(TRUE);
+ theToolBar->Show(true);
}
-#endif // __WXWINCE__
#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
- if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR )
+ if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
{
- //CreateStatusBar(m_fsStatusBarFields);
- if (GetStatusBar())
+ 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)
{
- GetStatusBar()->Show(TRUE);
- PositionStatusBar();
+ ::SetMenu(GetHwnd(), (HMENU)menu);
}
}
-#endif // wxUSE_STATUSBAR
-#if defined(__WXMICROWIN__)
-#elif defined(__WXWINCE__)
- // TODO: make it work for WinCE
-#else
- if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
- SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
-#endif
+#if wxUSE_STATUSBAR
+ wxStatusBar *theStatusBar = GetStatusBar();
+
+ if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
+ {
+ theStatusBar->Show(true);
+ PositionStatusBar();
+ }
+#endif // wxUSE_STATUSBAR
}
+#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
return wxFrameBase::ShowFullScreen(show, style);
}
void wxFrame::PositionToolBar()
{
+ int x = 0, y = 0;
wxToolBar *toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() )
{
height -= statbar->GetClientSize().y;
}
#endif // wxUSE_STATUSBAR
-
- int x = 0;
- int y = 0;
+ int tx, ty, tw, th;
+ toolbar->GetPosition( &tx, &ty );
+ toolbar->GetSize( &tw, &th );
+ if( ( toolbar->GetWindowStyleFlag() & wxTB_HORIZONTAL ) || ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) )
+ {
+ x = 0;
+ y = 0;
+ }
+ else if( toolbar->GetWindowStyleFlag() & wxTB_BOTTOM )
+ {
+ x = 0;
+ y = height - th;
+ }
#if defined(WINCE_WITH_COMMANDBAR)
- // We're using a commandbar - so we have to allow for it.
- if (GetMenuBar() && GetMenuBar()->GetCommandBar())
- {
- RECT rect;
- ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
- y = rect.bottom - rect.top;
- }
+ // We're using a commandbar - so we have to allow for it.
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+ {
+ RECT rect;
+ ::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);
-
+ if( ( toolbar->GetWindowStyleFlag() & wxTB_HORIZONTAL ) || ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) )
+ {
// Adjust
if (ty < 0 && (-ty == th))
ty = 0;
if (tx < 0 && (-tx == tw))
- tx = 0;
-
+ tx = 0;
+ }
+ else if( toolbar->GetWindowStyleFlag() & wxTB_BOTTOM )
+ {
+ if( ty < 0 && ( -ty == th ) )
+ ty = height - th;
+ if( tx < 0 && ( -tx == tw ) )
+ tx = 0;
+ }
+
int desiredW = tw;
int desiredH = th;
desiredW = width;
// if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
// desiredW -= 3;
- }
+ }
// 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 = TRUE;
- bool widthChanging = TRUE;
-
+ // when the frame changes, otherwise we'll get a lot of flicker.
+ bool heightChanging wxDUMMY_INITIALIZE(true);
+ bool widthChanging wxDUMMY_INITIALIZE(true);
+
if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
{
// 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
+
+ // The next time around, we may not have to set the size
if (heightChanging)
desiredH = desiredH + 200;
}
widthChanging = (desiredW > tw) ;
heightChanging = (desiredH != th) ;
- // The next time around, we may not have to set the size
+ // The next time around, we may not have to set the size
if (widthChanging)
desiredW = desiredW + 200;
}
-
+
if (tx != 0 || ty != 0 || widthChanging || heightChanging)
toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
-
+
#endif // __WXWINCE__
}
}
// on the desktop, but are iconized/restored with it
void wxFrame::IconizeChildFrames(bool bIconize)
{
+ m_iconized = bIconize;
+
for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
node;
node = node->GetNext() )
// them appear in the taskbar because they are, by virtue of this
// style, not managed by the taskbar - instead leave Windows take care
// of them
-#ifdef __WIN95__
if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
continue;
-#endif // Win95
// the child MDI frames are a special case and should not be touched by
// the parent frame - instead, they are managed by the user
wxFrame *frame = wxDynamicCast(win, wxFrame);
if ( frame
#if wxUSE_MDI_ARCHITECTURE
- && !wxDynamicCast(frame, wxMDIChildFrame)
+ && !frame->IsMDIChild()
#endif // wxUSE_MDI_ARCHITECTURE
)
{
// preprocessing
// ---------------------------------------------------------------------------
-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
{
if ( wxWindow::MSWTranslateMessage(pMsg) )
- return TRUE;
+ return true;
#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
// try the menu bar accels
wxMenuBar *menuBar = GetMenuBar();
- if ( !menuBar )
- return FALSE;
-
- const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
- return acceleratorTable.Translate(this, pMsg);
-#else
- return FALSE;
+ if ( menuBar )
+ {
+ const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+ return acceleratorTable.Translate(frame, pMsg);
+ }
#endif // wxUSE_MENUS && wxUSE_ACCEL
+
+ return false;
}
// ---------------------------------------------------------------------------
bool wxFrame::HandlePaint()
{
RECT rect;
- if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
+ if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) )
{
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
if ( m_iconized )
::EndPaint(GetHwnd(), &ps);
- return TRUE;
+ return true;
}
else
#endif
else
{
// nothing to paint - processed
- return TRUE;
+ return true;
}
}
-bool wxFrame::HandleSize(int x, int y, WXUINT id)
+bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
{
- bool processed = FALSE;
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-
switch ( id )
{
- case SIZENORMAL:
+ case SIZE_RESTORED:
+ case SIZE_MAXIMIZED:
// only do it it if we were iconized before, otherwise resizing the
// parent frame has a curious side effect of bringing it under it's
// children
break;
// restore all child frames too
- IconizeChildFrames(FALSE);
+ IconizeChildFrames(false);
- (void)SendIconizeEvent(FALSE);
-
- // fall through
-
- case SIZEFULLSCREEN:
- m_iconized = FALSE;
+ (void)SendIconizeEvent(false);
break;
- case SIZEICONIC:
+ case SIZE_MINIMIZED:
// iconize all child frames too
- IconizeChildFrames(TRUE);
-
- (void)SendIconizeEvent();
-
- m_iconized = TRUE;
+ IconizeChildFrames(true);
break;
}
-#endif
+#else
+ wxUnusedVar(id);
+#endif // !__WXWINCE__
if ( !m_iconized )
{
#endif // wxUSE_TOOLBAR
#if defined(WINCE_WITH_COMMANDBAR)
- // Position the menu command bar
- if (GetMenuBar() && GetMenuBar()->GetCommandBar())
- {
- RECT rect;
- ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
- wxSize clientSz = GetClientSize();
-
- if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) )
- {
- wxLogLastError(wxT("MoveWindow"));
- }
-
- }
-#endif
+ // Position the menu command bar
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+ {
+ RECT rect;
+ ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+ wxSize clientSz = GetClientSize();
+ if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) )
+ {
+ wxLogLastError(wxT("MoveWindow"));
+ }
- processed = wxWindow::HandleSize(x, y, id);
+ }
+#endif // WINCE_WITH_COMMANDBAR
}
- return processed;
+ // call the base class version to generate the appropriate events
+ return false;
}
bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
}
#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;
+ return true;
}
}
- return FALSE;
+ return false;
}
bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
// 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);
+ DoGiveHelp(wxEmptyString, false);
- return FALSE;
+ return false;
}
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
WXLRESULT rc = 0;
- bool processed = FALSE;
+ bool processed = false;
switch ( message )
{
break;
case WM_EXITMENULOOP:
- processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
+ processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);
break;
case WM_QUERYDRAGICON:
}
}
}
-
+
wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
event.SetEventObject(this);
{
pt.x += w;
}
- else
+ else if( !( toolbar->GetWindowStyleFlag() & wxTB_BOTTOM ) )
{
pt.y += h;
}
#endif // wxUSE_TOOLBAR
#if defined(WINCE_WITH_COMMANDBAR)
- if (GetMenuBar() && GetMenuBar()->GetCommandBar())
- {
- RECT rect;
- ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
- pt.y += (rect.bottom - rect.top);
- }
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+ {
+ RECT rect;
+ ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+ pt.y += (rect.bottom - rect.top);
+ }
#endif
return pt;
projects / wxWidgets.git / blobdiff