#include "wx/univ/colschem.h"
#endif // __WXUNIVERSAL__
+// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
+// could be removed once support for it is dropped.
+#ifndef WM_UNINITMENUPOPUP
+ #define WM_UNINITMENUPOPUP 0x0125
+#endif
+
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
-#if wxUSE_MENUS_NATIVE
+#if wxUSE_MENUS || wxUSE_MENUS_NATIVE
extern wxMenu *wxCurrentPopupMenu;
-#endif // wxUSE_MENUS_NATIVE
+#endif // wxUSE_MENUS || wxUSE_MENUS_NATIVE
// ----------------------------------------------------------------------------
// event tables
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
// ============================================================================
wxStatusBar *statbar = GetStatusBar();
if ( statbar && statbar->IsShown() )
{
- *y -= statbar->GetClientSize().y;
+ *y -= statbar->GetSize().y;
}
}
#endif // wxUSE_STATUSBAR
// wxFrame: various geometry-related functions
// ----------------------------------------------------------------------------
-void wxFrame::Raise()
-{
- ::SetForegroundWindow(GetHwnd());
-}
-
// generate an artificial resize event
void wxFrame::SendSizeEvent(int flags)
{
// adjust for menu / titlebar height
rc.bottom -= (2*menuHeight-1);
- ::MoveWindow(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;
}
}
#endif // wxUSE_MENUS_NATIVE
+#if wxUSE_MENUS
+wxMenu* wxFrame::MSWFindMenuFromHMENU(WXHMENU hMenu)
+{
+ return GetMenuBar() ? GetMenuBar()->MSWGetMenu(hMenu) : NULL;
+}
+#endif // wxUSE_MENUS
+
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
- Refresh();
+ // Don't override the colour explicitly set by the user, if any.
+ if ( !UseBgCol() )
+ {
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+ Refresh();
+ }
#if wxUSE_STATUSBAR
if ( m_frameStatusBar )
tx = 0;
}
- int desiredW = tw;
- int desiredH = th;
+ int desiredW,
+ desiredH;
if ( toolbar->IsVertical() )
{
+ desiredW = tw;
desiredH = height;
}
else
{
desiredW = width;
+ desiredH = th;
}
- // use the 'real' MSW position here, don't offset relativly to the
+ // use the 'real' MSW position here, don't offset relatively 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);
-
- 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;
- }
- 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;
- }
-
- if (tx != 0 || ty != 0 || widthChanging || heightChanging)
- toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+ toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
}
#endif // !WINCE_WITH_COMMANDBAR
bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
#if wxUSE_MENUS
+
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (GetToolBar() && GetToolBar()->FindById(id))
+ return GetToolBar()->MSWCommand(cmd, id);
+#endif
+
// 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 */) )
return wxFrameBase::HandleCommand(id, cmd, control);;
}
-#if wxUSE_MENUS
-
-bool wxFrame::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
- {
- // 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, true);
-
- return false;
- }
-
- wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
- event.SetEventObject(this);
-
- return HandleWindowEvent(event);
-}
-
-bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
-{
- // we don't have the menu id here, so we use the id to specify if the event
- // was from a popup menu or a normal one
- wxMenuEvent event(evtType, isPopup ? -1 : 0);
- event.SetEventObject(this);
-
- return HandleWindowEvent(event);
-}
-
-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 HandleWindowEvent(event);
-}
-
-#endif // wxUSE_MENUS
-
// ---------------------------------------------------------------------------
// the window proc for wxFrame
// ---------------------------------------------------------------------------
break;
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-#if wxUSE_MENUS
- case WM_INITMENUPOPUP:
- processed = HandleInitMenuPopup((WXHMENU) wParam);
- break;
-
- case WM_MENUSELECT:
- {
- WXWORD item, flags;
- WXHMENU hmenu;
- UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
-
- processed = HandleMenuSelect(item, flags, hmenu);
- }
- break;
-
- 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 hIcon = icon.IsOk() ? GetHiconOf(icon)
: (HICON)GetDefaultIcon();
rc = (WXLRESULT)hIcon;
processed = rc != 0;
projects / wxWidgets.git / blobdiff