/////////////////////////////////////////////////////////////////////////////
// Name: msw/frame.cpp
-// Purpose: wxFrame
+// Purpose: wxFrameMSW
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
#endif
#ifndef WX_PRECOMP
- #include "wx/setup.h"
#include "wx/frame.h"
- #include "wx/menu.h"
#include "wx/app.h"
+ #include "wx/menu.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/settings.h"
#include "wx/menuitem.h"
#include "wx/log.h"
+#ifdef __WXUNIVERSAL__
+ #include "wx/univ/theme.h"
+ #include "wx/univ/colschem.h"
+#endif // __WXUNIVERSAL__
+
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
-extern wxWindowList wxModelessWindows;
-extern wxList WXDLLEXPORT wxPendingDelete;
extern const wxChar *wxFrameClassName;
+
+#if wxUSE_MENUS_NATIVE
extern wxMenu *wxCurrentPopupMenu;
+#endif // wxUSE_MENUS_NATIVE
// ----------------------------------------------------------------------------
// event tables
// ----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
- EVT_ACTIVATE(wxFrame::OnActivate)
- EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase)
+ EVT_ACTIVATE(wxFrameMSW::OnActivate)
+ EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+#ifndef __WXUNIVERSAL__
+ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+#endif
// ============================================================================
// implementation
// static class members
// ----------------------------------------------------------------------------
-#if wxUSE_NATIVE_STATUSBAR
- bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
- bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
+#if wxUSE_STATUSBAR
+ #if wxUSE_NATIVE_STATUSBAR
+ bool wxFrameMSW::m_useNativeStatusBar = TRUE;
+ #else
+ bool wxFrameMSW::m_useNativeStatusBar = FALSE;
+ #endif
+#endif // wxUSE_NATIVE_STATUSBAR
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
-void wxFrame::Init()
+void wxFrameMSW::Init()
{
- m_iconized = FALSE;
-
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
#endif
m_isShown = FALSE;
}
-bool wxFrame::Create(wxWindow *parent,
+bool wxFrameMSW::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos,
long style,
const wxString& name)
{
- SetName(name);
- m_windowStyle = style;
- m_frameMenuBar = NULL;
- m_frameToolBar = NULL;
- m_frameStatusBar = NULL;
-
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
- if ( id > -1 )
- m_windowId = id;
- else
- m_windowId = (int)NewControlId();
-
- if (parent) parent->AddChild(this);
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- m_iconized = FALSE;
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ return FALSE;
- wxTopLevelWindows.Append(this);
+ // the frame must have NULL parent HWND or it would be always on top of its
+ // parent which is not what we usually want (in fact, we only want it for
+ // frames with the special wxFRAME_TOOL_WINDOW style handled elsewhere)
+ if ( !MSWCreate(m_windowId, NULL, wxFrameClassName, this, title,
+ pos.x, pos.y, size.x, size.y, style) )
+ return FALSE;
- MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
- x, y, width, height, style);
+ SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
- wxModelessWindows.Append(this);
+ wxModelessWindows.Append(this);
- return TRUE;
+ return TRUE;
}
-wxFrame::~wxFrame()
+wxFrameMSW::~wxFrameMSW()
{
- m_isBeingDeleted = TRUE;
- wxTopLevelWindows.DeleteObject(this);
-
- // the ~wxToolBar() code relies on the previous line to be executed before
- // this one, i.e. the frame should remove itself from wxTopLevelWindows
- // before destorying its toolbar
- DeleteAllBars();
-
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
- {
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- PostQuitMessage(0);
- }
- }
+ m_isBeingDeleted = TRUE;
- wxModelessWindows.DeleteObject(this);
-
- // For some reason, wxWindows can activate another task altogether
- // when a frame is destroyed after a modal dialog has been invoked.
- // Try to bring the parent to the top.
- // MT:Only do this if this frame is currently the active window, else weird
- // things start to happen
- if ( wxGetActiveWindow() == this )
- if (GetParent() && GetParent()->GetHWND())
- ::BringWindowToTop((HWND) GetParent()->GetHWND());
+ DeleteAllBars();
}
// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::DoGetClientSize(int *x, int *y) const
+void wxFrameMSW::DoGetClientSize(int *x, int *y) const
{
RECT rect;
::GetClientRect(GetHwnd(), &rect);
*y = rect.bottom;
}
-// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
-void wxFrame::DoSetClientSize(int width, int height)
+void wxFrameMSW::DoSetClientSize(int width, int height)
{
- HWND hWnd = GetHwnd();
-
- RECT rect;
- ::GetClientRect(hWnd, &rect);
-
- RECT rect2;
- GetWindowRect(hWnd, &rect2);
-
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window
- int actual_width = rect2.right - rect2.left - rect.right + width;
- int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
-
+ // leave enough space for the status bar if we have (and show) it
#if wxUSE_STATUSBAR
- if ( GetStatusBar() && GetStatusBar()->IsShown())
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- actual_height += statusY;
- }
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar && statbar->IsShown() )
+ {
+ height += statbar->GetSize().y;
+ }
#endif // wxUSE_STATUSBAR
- wxPoint pt(GetClientAreaOrigin());
- actual_width += pt.y;
- actual_height += pt.x;
-
- POINT point;
- point.x = rect2.left;
- point.y = rect2.top;
-
- MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
-
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
-}
-
-void wxFrame::DoGetSize(int *width, int *height) const
-{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
- *width = rect.right - rect.left;
- *height = rect.bottom - rect.top;
-}
-
-void wxFrame::DoGetPosition(int *x, int *y) const
-{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
- POINT point;
- point.x = rect.left;
- point.y = rect.top;
-
- *x = point.x;
- *y = point.y;
+ wxTopLevelWindow::DoSetClientSize(width, height);
}
// ----------------------------------------------------------------------------
-// variations around ::ShowWindow()
+// wxFrameMSW: various geometry-related functions
// ----------------------------------------------------------------------------
-void wxFrame::DoShowWindow(int nShowCmd)
+void wxFrameMSW::Raise()
{
- ::ShowWindow(GetHwnd(), nShowCmd);
-
- m_iconized = nShowCmd == SW_MINIMIZE;
+#ifdef __WIN16__
+ // no SetForegroundWindow() in Win16
+ wxFrameBase::Raise();
+#else // Win32
+ ::SetForegroundWindow(GetHwnd());
+#endif // Win16/32
}
-bool wxFrame::Show(bool show)
+// generate an artificial resize event
+void wxFrameMSW::SendSizeEvent()
{
- // don't use wxWindow version as we want to call DoShowWindow()
- if ( !wxWindowBase::Show(show) )
- return FALSE;
-
- DoShowWindow(show ? SW_SHOW : SW_HIDE);
-
- if ( show )
+ if ( !m_iconized )
{
- ::BringWindowToTop(GetHwnd());
+ RECT r = wxGetWindowRect(GetHwnd());
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
- }
- else
- {
- // Try to highlight the correct window (the parent)
- if ( GetParent() )
- {
- HWND hWndParent = GetHwndOf(GetParent());
- if (hWndParent)
- ::BringWindowToTop(hWndParent);
- }
+ (void)::PostMessage(GetHwnd(), WM_SIZE,
+ IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+ MAKELPARAM(r.right - r.left, r.bottom - r.top));
}
-
- return TRUE;
-}
-
-void wxFrame::Iconize(bool iconize)
-{
- DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
-}
-
-void wxFrame::Maximize(bool maximize)
-{
- DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
-}
-
-void wxFrame::Restore()
-{
- DoShowWindow(SW_RESTORE);
-}
-
-bool wxFrame::IsIconized() const
-{
- ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
- return m_iconized;
-}
-
-// Is it maximized?
-bool wxFrame::IsMaximized() const
-{
- return (::IsZoomed(GetHwnd()) != 0);
-}
-
-void wxFrame::SetIcon(const wxIcon& icon)
-{
- wxFrameBase::SetIcon(icon);
-
-#if defined(__WIN95__)
- if ( m_icon.Ok() )
- {
- SendMessage(GetHwnd(), WM_SETICON,
- (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
- }
-#endif // __WIN95__
}
#if wxUSE_STATUSBAR
-wxStatusBar *wxFrame::OnCreateStatusBar(int number,
+wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number,
long style,
wxWindowID id,
const wxString& name)
return statusBar;
}
-void wxFrame::PositionStatusBar()
+void wxFrameMSW::PositionStatusBar()
{
if ( !m_frameStatusBar )
return;
}
#endif // wxUSE_STATUSBAR
-void wxFrame::DetachMenuBar()
-{
- if ( m_frameMenuBar )
- {
- m_frameMenuBar->Detach();
- m_frameMenuBar = NULL;
- }
-}
+#if wxUSE_MENUS_NATIVE
-void wxFrame::SetMenuBar(wxMenuBar *menubar)
+void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
{
+ wxFrameBase::AttachMenuBar(menubar);
+
if ( !menubar )
{
- DetachMenuBar();
-
// actually remove the menu from the frame
m_hMenu = (WXHMENU)0;
InternalSetMenuBar();
}
else // set new non NULL menu bar
{
- m_frameMenuBar = NULL;
-
// Can set a menubar several times.
- // TODO: how to prevent a memory leak if you have a currently-unattached
- // menubar? wxWindows assumes that the frame will delete the menu (otherwise
- // there are problems for MDI).
if ( menubar->GetHMenu() )
{
m_hMenu = menubar->GetHMenu();
}
- else
+ else // no HMENU yet
{
- menubar->Detach();
-
m_hMenu = menubar->Create();
if ( !m_hMenu )
+ {
+ wxFAIL_MSG( _T("failed to create menu bar") );
return;
+ }
}
InternalSetMenuBar();
-
- m_frameMenuBar = menubar;
- menubar->Attach(this);
}
}
-void wxFrame::InternalSetMenuBar()
+void wxFrameMSW::InternalSetMenuBar()
{
+#ifndef __WXMICROWIN__
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
wxLogLastError(wxT("SetMenu"));
}
+#endif
}
+#endif // wxUSE_MENUS_NATIVE
+
// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event)
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
+#if wxUSE_STATUSBAR
if ( m_frameStatusBar )
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
}
+#endif // wxUSE_STATUSBAR
// Propagate the event to the non-top-level children
wxWindow::OnSysColourChanged(event);
}
// Pass TRUE to show full screen, FALSE to restore.
-bool wxFrame::ShowFullScreen(bool show, long style)
+bool wxFrameMSW::ShowFullScreen(bool show, long style)
{
if (show)
{
m_fsIsShowing = TRUE;
m_fsStyle = style;
+#if wxUSE_TOOLBAR
wxToolBar *theToolBar = GetToolBar();
- wxStatusBar *theStatusBar = GetStatusBar();
-
- int dummyWidth;
-
if (theToolBar)
- theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
- if (theStatusBar)
- theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+ theToolBar->GetSize(NULL, &m_fsToolBarHeight);
// zap the toolbar, menubar, and statusbar
theToolBar->SetSize(-1,0);
theToolBar->Show(FALSE);
}
+#endif // wxUSE_TOOLBAR
+#ifndef __WXMICROWIN__
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)
}
else
m_fsStatusBarFields = 0;
+#endif // wxUSE_STATUSBAR
// zap the frame borders
LONG offFlags = 0;
if (style & wxFULLSCREEN_NOBORDER)
- offFlags |= WS_BORDER;
+ offFlags |= WS_BORDER | WS_THICKFRAME;
if (style & wxFULLSCREEN_NOCAPTION)
offFlags |= (WS_CAPTION | WS_SYSMENU);
newStyle &= (~offFlags);
// change our window style to be compatible with full-screen mode
- SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
+ ::SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
// resize to the size of the desktop
int width, height;
- RECT rect;
- ::GetWindowRect(GetDesktopWindow(), &rect);
+ RECT rect = wxGetWindowRect(::GetDesktopWindow());
width = rect.right - rect.left;
height = rect.bottom - rect.top;
m_fsIsShowing = FALSE;
+#if wxUSE_TOOLBAR
wxToolBar *theToolBar = GetToolBar();
// restore the toolbar, menubar, and statusbar
theToolBar->SetSize(-1, m_fsToolBarHeight);
theToolBar->Show(TRUE);
}
+#endif // wxUSE_TOOLBAR
- if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR)) // && (m_fsStatusBarFields > 0))
+#if wxUSE_STATUSBAR
+ if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR )
{
//CreateStatusBar(m_fsStatusBarFields);
if (GetStatusBar())
PositionStatusBar();
}
}
+#endif // wxUSE_STATUSBAR
+#ifndef __WXMICROWIN__
if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
+#endif
Maximize(m_fsIsMaximized);
SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
*
*/
-bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
+bool wxFrameMSW::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
int x, int y, int width, int height, long style)
{
- m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-
// If child windows aren't properly drawn initially, WS_CLIPCHILDREN
// could be the culprit. But without it, you can get a lot of flicker.
if (style & wxCLIP_CHILDREN)
msflags |= WS_CLIPCHILDREN;
- // Keep this in wxFrame because it saves recoding this function
+ // Keep this in wxFrameMSW because it saves recoding this function
// in wxTinyFrame
#if wxUSE_ITSY_BITSY && !defined(__WIN32__)
if (style & wxTINY_CAPTION_VERT)
// Default activation behaviour - set the focus for the first child
// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrameMSW::OnActivate(wxActivateEvent& event)
{
if ( event.GetActive() )
{
// restore focus to the child which was last focused
- wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
+ wxLogTrace(_T("focus"), _T("wxFrameMSW %08x activated."), m_hWnd);
- wxSetFocusToChild(this, &m_winLastFocused);
+ wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+ : NULL;
+ if ( !parent )
+ {
+ parent = this;
+ }
+
+ wxSetFocusToChild(parent, &m_winLastFocused);
}
- else
+ else // deactivating
{
- // remember the last focused child
+ // remember the last focused child if it is our child
m_winLastFocused = FindFocus();
- while ( m_winLastFocused )
+
+ // so we NULL it out if it's a child from some other frame
+ wxWindow *win = m_winLastFocused;
+ while ( win )
{
- if ( GetChildren().Find(m_winLastFocused) )
+ if ( win->IsTopLevel() )
+ {
+ if ( win != this )
+ {
+ m_winLastFocused = NULL;
+ }
+
break;
+ }
- m_winLastFocused = m_winLastFocused->GetParent();
+ win = win->GetParent();
}
wxLogTrace(_T("focus"),
- _T("wxFrame %08x deactivated, last focused: %08x."),
+ _T("wxFrameMSW %08x deactivated, last focused: %08x."),
m_hWnd,
m_winLastFocused ? GetHwndOf(m_winLastFocused)
: NULL);
#if wxUSE_TOOLBAR
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
return m_frameToolBar;
}
-void wxFrame::PositionToolBar()
+void wxFrameMSW::PositionToolBar()
{
RECT rect;
::GetClientRect(GetHwnd(), &rect);
// propagate our state change to all child frames: this allows us to emulate X
// Windows behaviour where child frames float independently of the parent one
// on the desktop, but are iconized/restored with it
-void wxFrame::IconizeChildFrames(bool bIconize)
+void wxFrameMSW::IconizeChildFrames(bool bIconize)
{
for ( wxWindowList::Node *node = GetChildren().GetFirst();
node;
// 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 && !frame->IsMDIChild() )
+ if ( frame
+#if wxUSE_MDI_ARCHITECTURE
+ && !wxDynamicCast(frame, wxMDIChildFrame)
+#endif // wxUSE_MDI_ARCHITECTURE
+ )
{
frame->Iconize(bIconize);
}
}
}
+WXHICON wxFrameMSW::GetDefaultIcon() const
+{
+ return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
+ : wxDEFAULT_FRAME_ICON);
+}
+
// ===========================================================================
// message processing
// ===========================================================================
// preprocessing
// ---------------------------------------------------------------------------
-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg)
{
if ( wxWindow::MSWTranslateMessage(pMsg) )
return TRUE;
+#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
// try the menu bar accels
wxMenuBar *menuBar = GetMenuBar();
if ( !menuBar )
const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
return acceleratorTable.Translate(this, pMsg);
+#else
+ return FALSE;
+#endif // wxUSE_MENUS && wxUSE_ACCEL
}
// ---------------------------------------------------------------------------
// our private (non virtual) message handlers
// ---------------------------------------------------------------------------
-bool wxFrame::HandlePaint()
+bool wxFrameMSW::HandlePaint()
{
RECT rect;
if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
{
+#ifndef __WXMICROWIN__
if ( m_iconized )
{
HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
- : (HICON)m_defaultIcon;
+ : (HICON)GetDefaultIcon();
// Hold a pointer to the dc so long as the OnPaint() message
// is being processed
return TRUE;
}
else
+ #endif
{
return wxWindow::HandlePaint();
}
}
}
-bool wxFrame::HandleSize(int x, int y, WXUINT id)
+bool wxFrameMSW::HandleSize(int x, int y, WXUINT id)
{
bool processed = FALSE;
+#ifndef __WXMICROWIN__
switch ( id )
{
// restore all child frames too
IconizeChildFrames(FALSE);
+ (void)SendIconizeEvent(FALSE);
+
// fall through
case SIZEFULLSCREEN:
// iconize all child frames too
IconizeChildFrames(TRUE);
+ (void)SendIconizeEvent();
+
m_iconized = TRUE;
break;
}
+#endif
if ( !m_iconized )
{
+#if wxUSE_STATUSBAR
PositionStatusBar();
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
PositionToolBar();
+#endif // wxUSE_TOOLBAR
wxSizeEvent event(wxSize(x, y), m_windowId);
event.SetEventObject( this );
return processed;
}
-bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
+bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
if ( control )
{
// handle here commands from menus and accelerators
if ( cmd == 0 || cmd == 1 )
{
+#if wxUSE_MENUS_NATIVE
if ( wxCurrentPopupMenu )
{
wxMenu *popupMenu = wxCurrentPopupMenu;
return popupMenu->MSWCommand(cmd, id);
}
+#endif // wxUSE_MENUS_NATIVE
if ( ProcessCommand(id) )
{
return FALSE;
}
-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU 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
{
+#if wxUSE_STATUSBAR
// 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
{
statbar->SetStatusText(wxEmptyString);
}
+#endif // wxUSE_STATUSBAR
return FALSE;
}
}
// ---------------------------------------------------------------------------
-// the window proc for wxFrame
+// the window proc for wxFrameMSW
// ---------------------------------------------------------------------------
-long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
long rc = 0;
bool processed = FALSE;
}
break;
+#ifndef __WXMICROWIN__
case WM_MENUSELECT:
{
WXWORD item, flags;
processed = HandleMenuSelect(item, flags, hmenu);
}
break;
+#endif
case WM_PAINT:
processed = HandlePaint();
break;
+#ifndef __WXMICROWIN__
case WM_QUERYDRAGICON:
{
HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
- : (HICON)(m_defaultIcon);
+ : (HICON)GetDefaultIcon();
rc = (long)hIcon;
processed = rc != 0;
}
break;
+#endif
case WM_SIZE:
processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
projects / wxWidgets.git / blobdiff