// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "frame.h"
#endif
#include "wx/msw/private.h"
+#ifdef __WXWINCE__
+#include <commctrl.h>
+#endif
+
#if wxUSE_STATUSBAR
#include "wx/statusbr.h"
#include "wx/generic/statusbr.h"
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
- EVT_ACTIVATE(wxFrame::OnActivate)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxFrameStyle )
+
+WX_BEGIN_FLAGS( wxFrameStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
+ WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
+ WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
+ WX_FLAGS_MEMBER(wxBORDER_RAISED)
+ WX_FLAGS_MEMBER(wxBORDER_STATIC)
+ WX_FLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
+ WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
+ WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
+ WX_FLAGS_MEMBER(wxRAISED_BORDER)
+ WX_FLAGS_MEMBER(wxSTATIC_BORDER)
+ WX_FLAGS_MEMBER(wxNO_BORDER)
+
+ // standard window styles
+ WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
+ WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
+ WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ WX_FLAGS_MEMBER(wxWANTS_CHARS)
+ WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+ WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ WX_FLAGS_MEMBER(wxVSCROLL)
+ WX_FLAGS_MEMBER(wxHSCROLL)
+
+ // frame styles
+ WX_FLAGS_MEMBER(wxSTAY_ON_TOP)
+ WX_FLAGS_MEMBER(wxCAPTION)
+ WX_FLAGS_MEMBER(wxTHICK_FRAME)
+ WX_FLAGS_MEMBER(wxSYSTEM_MENU)
+ WX_FLAGS_MEMBER(wxRESIZE_BORDER)
+ WX_FLAGS_MEMBER(wxRESIZE_BOX)
+ WX_FLAGS_MEMBER(wxCLOSE_BOX)
+ WX_FLAGS_MEMBER(wxMAXIMIZE_BOX)
+ WX_FLAGS_MEMBER(wxMINIMIZE_BOX)
+
+ WX_FLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
+ WX_FLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
+
+ WX_FLAGS_MEMBER(wxFRAME_SHAPED)
+
+WX_END_FLAGS( wxFrameStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxFrame)
+ WX_EVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+
+ WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ WX_PROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ WX_PROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxFrame)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+#else
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
+#endif
// ============================================================================
// implementation
m_fsStatusBarFields = 0;
m_fsStatusBarHeight = 0;
m_fsToolBarHeight = 0;
-// m_fsMenu = 0;
m_wasMinimized = FALSE;
-
- m_winLastFocused = (wxWindow *)NULL;
}
bool wxFrame::Create(wxWindow *parent,
wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
-
DeleteAllBars();
}
void wxFrame::Raise()
{
-#ifdef __WIN16__
- // no SetForegroundWindow() in Win16
- wxFrameBase::Raise();
-#else // Win32
::SetForegroundWindow(GetHwnd());
-#endif // Win16/32
}
// generate an artificial resize event
}
else // set new non NULL menu bar
{
+#ifndef __WXWINCE__
// Can set a menubar several times.
if ( menubar->GetHMenu() )
{
return;
}
}
-
+#endif
InternalSetMenuBar();
}
}
void wxFrame::InternalSetMenuBar()
{
-#ifndef __WXMICROWIN__
+#ifdef __WXMICROWIN__
+ // Nothing
+#elif defined(__WXWINCE__)
+
+ if (!GetToolBar())
+ {
+ wxToolBar* toolBar = new wxToolBar(this, -1,
+ wxDefaultPosition, wxDefaultSize,
+ wxBORDER_NONE | wxTB_HORIZONTAL,
+ wxToolBarNameStr, GetMenuBar());
+ SetToolBar(toolBar);
+ }
+#else
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
wxLogLastError(wxT("SetMenu"));
// Pass TRUE to show full screen, FALSE to restore.
bool wxFrame::ShowFullScreen(bool show, long style)
{
- if ( IsFullScreen() == show )
+ if ( IsFullScreen() == show )
return FALSE;
if (show)
{
#if wxUSE_TOOLBAR
+#ifdef __WXWINCE__
+ // TODO: hide commandbar
+#else
wxToolBar *theToolBar = GetToolBar();
if (theToolBar)
theToolBar->GetSize(NULL, &m_fsToolBarHeight);
theToolBar->SetSize(-1,0);
theToolBar->Show(FALSE);
}
+#endif // __WXWINCE__
#endif // wxUSE_TOOLBAR
-#ifndef __WXMICROWIN__
+ // TODO: make it work for WinCE
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
if (style & wxFULLSCREEN_NOMENUBAR)
SetMenu((HWND)GetHWND(), (HMENU) NULL);
#endif
else
{
#if wxUSE_TOOLBAR
+#ifdef __WXWINCE__
+ // TODO: show commandbar
+#else
wxToolBar *theToolBar = GetToolBar();
// restore the toolbar, menubar, and statusbar
theToolBar->SetSize(-1, m_fsToolBarHeight);
theToolBar->Show(TRUE);
}
+#endif // __WXWINCE__
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
}
#endif // wxUSE_STATUSBAR
-#ifndef __WXMICROWIN__
+ // TODO: make it work for WinCE
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
#endif
}
-
- return wxFrameBase::ShowFullScreen(show, style);
-}
-
-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
-{
- if ( event.GetActive() )
- {
- // restore focus to the child which was last focused
- wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
-
- wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
- : NULL;
- if ( !parent )
- {
- parent = this;
- }
-
- wxSetFocusToChild(parent, &m_winLastFocused);
- }
- else // deactivating
- {
- // remember the last focused child if it is our child
- m_winLastFocused = FindFocus();
-
- // so we NULL it out if it's a child from some other frame
- wxWindow *win = m_winLastFocused;
- while ( win )
- {
- if ( win->IsTopLevel() )
- {
- if ( win != this )
- {
- m_winLastFocused = NULL;
- }
-
- break;
- }
- win = win->GetParent();
- }
-
- wxLogTrace(_T("focus"),
- _T("wxFrame %08x deactivated, last focused: %08x."),
- m_hWnd,
- m_winLastFocused ? GetHwndOf(m_winLastFocused)
- : NULL);
-
- event.Skip();
- }
+ return wxFrameBase::ShowFullScreen(show, style);
}
// ----------------------------------------------------------------------------
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
+#ifdef __WXWINCE__
+ // We may already have a toolbar from calling SetMenuBar.
+ if (GetToolBar())
+ return GetToolBar();
+#endif
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
PositionToolBar();
wxToolBar *toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() )
{
+#ifdef __WXWINCE__
+ // 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 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;
if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
{
- th = height;
+ desiredH = height;
}
else
{
- tw = width;
- if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
- th -= 3;
- }
+ desiredW = width;
+// if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
+// desiredW -= 3;
+ }
// use the 'real' MSW position here, don't offset relativly to the
// client area origin
- toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);
+
+ // 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;
+
+ 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
+ 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(0, 0, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+
+#endif // __WXWINCE__
}
}
// on the desktop, but are iconized/restored with it
void wxFrame::IconizeChildFrames(bool bIconize)
{
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
+ for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
node;
node = node->GetNext() )
{
WXHICON wxFrame::GetDefaultIcon() const
{
- return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
- : wxDEFAULT_FRAME_ICON);
+ // we don't have any standard icons (any more)
+ return (WXHICON)0;
}
// ===========================================================================
RECT rect;
if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
{
-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
if ( m_iconized )
{
const wxIcon& icon = GetIcon();
bool wxFrame::HandleSize(int x, int y, WXUINT id)
{
bool processed = FALSE;
-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
switch ( id )
{
processed = HandlePaint();
break;
-#ifndef __WXMICROWIN__
+ case WM_INITMENUPOPUP:
+ processed = HandleInitMenuPopup((WXHMENU) wParam);
+ break;
+
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
case WM_MENUSELECT:
{
WXWORD item, flags;
}
break;
-#ifndef __WIN16__
- case WM_ENTERMENULOOP:
- processed = HandleMenuLoop(wxEVT_MENU_OPEN, wParam);
- break;
-
case WM_EXITMENULOOP:
processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
break;
-#endif // __WIN16__
case WM_QUERYDRAGICON:
{
}
if ( !processed )
- rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+ rc = wxFrameBase::MSWWindowProc(message, wParam, lParam);
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);
+}
projects / wxWidgets.git / blobdiff