/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: msw/frame.cpp
// Purpose: wxFrame
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "frame.h"
+ #pragma implementation "frame.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#endif // WX_PRECOMP
#include "wx/msw/private.h"
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
+
+#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"
-#if wxUSE_NATIVE_STATUSBAR
- #include <wx/msw/statbr95.h>
-#endif
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
extern wxWindowList wxModelessWindows;
extern wxList WXDLLEXPORT wxPendingDelete;
-extern wxChar wxFrameClassName[];
+extern const wxChar *wxFrameClassName;
extern wxMenu *wxCurrentPopupMenu;
-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
- EVT_SIZE(wxFrame::OnSize)
- EVT_ACTIVATE(wxFrame::OnActivate)
- EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
- EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
- EVT_IDLE(wxFrame::OnIdle)
- EVT_CLOSE(wxFrame::OnCloseWindow)
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+ EVT_ACTIVATE(wxFrame::OnActivate)
+ EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static class members
+// ----------------------------------------------------------------------------
#if wxUSE_NATIVE_STATUSBAR
bool wxFrame::m_useNativeStatusBar = TRUE;
bool wxFrame::m_useNativeStatusBar = FALSE;
#endif
-wxFrame::wxFrame()
-{
- m_frameToolBar = NULL ;
- m_frameMenuBar = NULL;
- m_frameStatusBar = NULL;
-
- m_iconized = FALSE;
-}
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------
-bool wxFrame::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+void wxFrame::Init()
{
+ m_iconized = FALSE;
+
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
#endif
+ // Data to save/restore when calling ShowFullScreen
+ m_fsStyle = 0;
+ m_fsOldWindowStyle = 0;
+ m_fsStatusBarFields = 0;
+ m_fsStatusBarHeight = 0;
+ m_fsToolBarHeight = 0;
+// m_fsMenu = 0;
+ m_fsIsMaximized = FALSE;
+ m_fsIsShowing = FALSE;
+}
+
+bool wxFrame::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
+{
SetName(name);
m_windowStyle = style;
m_frameMenuBar = NULL;
- m_frameToolBar = NULL ;
+ m_frameToolBar = NULL;
m_frameStatusBar = NULL;
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-// m_icon = NULL;
if ( id > -1 )
m_windowId = id;
else
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
- if (m_frameStatusBar)
- delete m_frameStatusBar;
- if (m_frameMenuBar)
- delete m_frameMenuBar;
-
-/* New behaviour March 1998: check if it's the last top-level window */
-// if (wxTheApp && (this == wxTheApp->GetTopWindow()))
+ DeleteAllBars();
if (wxTheApp && (wxTopLevelWindows.Number() == 0))
{
// 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());
}
RECT rect;
::GetClientRect(GetHwnd(), &rect);
- if ( GetStatusBar() )
+#if wxUSE_STATUSBAR
+ if ( GetStatusBar() && GetStatusBar()->IsShown() )
{
int statusX, statusY;
GetStatusBar()->GetClientSize(&statusX, &statusY);
rect.bottom -= statusY;
}
+#endif // wxUSE_STATUSBAR
wxPoint pt(GetClientAreaOrigin());
rect.bottom -= pt.y;
rect.right -= pt.x;
- *x = rect.right;
- *y = rect.bottom;
+ if ( x )
+ *x = rect.right;
+ if ( y )
+ *y = rect.bottom;
}
// Set the client size (i.e. leave the calculation of borders etc.
int actual_width = rect2.right - rect2.left - rect.right + width;
int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
- if ( GetStatusBar() )
+#if wxUSE_STATUSBAR
+ if ( GetStatusBar() && GetStatusBar()->IsShown())
{
int statusX, statusY;
GetStatusBar()->GetClientSize(&statusX, &statusY);
actual_height += statusY;
}
+#endif // wxUSE_STATUSBAR
wxPoint pt(GetClientAreaOrigin());
actual_width += pt.y;
*y = point.y;
}
-void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+// ----------------------------------------------------------------------------
+// variations around ::ShowWindow()
+// ----------------------------------------------------------------------------
+
+void wxFrame::DoShowWindow(int nShowCmd)
{
- wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+ ::ShowWindow(GetHwnd(), nShowCmd);
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ m_iconized = nShowCmd == SW_MINIMIZE;
}
bool wxFrame::Show(bool show)
{
- int cshow;
- if (show)
- cshow = SW_SHOW;
- else
- cshow = SW_HIDE;
+ DoShowWindow(show ? SW_SHOW : SW_HIDE);
- if (!show)
- {
- // Try to highlight the correct window (the parent)
- HWND hWndParent = 0;
- if (GetParent())
+ if ( show )
{
- hWndParent = (HWND) GetParent()->GetHWND();
- if (hWndParent)
- ::BringWindowToTop(hWndParent);
- }
- }
+ ::BringWindowToTop(GetHwnd());
- ShowWindow(GetHwnd(), (BOOL)cshow);
- if (show)
- {
- BringWindowToTop(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);
+ }
+ }
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
- }
- return TRUE;
+ return TRUE;
}
void wxFrame::Iconize(bool iconize)
{
- if (!iconize)
- Show(TRUE);
-
- int cshow;
- if (iconize)
- cshow = SW_MINIMIZE;
- else
- cshow = SW_RESTORE;
- ShowWindow(GetHwnd(), (BOOL)cshow);
- m_iconized = iconize;
+ DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
}
-// Equivalent to maximize/restore in Windows
void wxFrame::Maximize(bool maximize)
{
- Show(TRUE);
- int cshow;
- if (maximize)
- cshow = SW_MAXIMIZE;
- else
- cshow = SW_RESTORE;
- ShowWindow(GetHwnd(), cshow);
- m_iconized = FALSE;
+ DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
+}
+
+void wxFrame::Restore()
+{
+ DoShowWindow(SW_RESTORE);
}
bool wxFrame::IsIconized() const
// Is it maximized?
bool wxFrame::IsMaximized() const
{
- return (::IsZoomed(GetHwnd()) != 0) ;
+ return (::IsZoomed(GetHwnd()) != 0);
}
void wxFrame::SetIcon(const wxIcon& icon)
{
- m_icon = icon;
+ wxFrameBase::SetIcon(icon);
+
#if defined(__WIN95__)
- if ( m_icon.Ok() )
- SendMessage(GetHwnd(), WM_SETICON,
- (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
-#endif
+ 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, long style, wxWindowID id,
- const wxString& name)
+wxStatusBar *wxFrame::OnCreateStatusBar(int number,
+ long style,
+ wxWindowID id,
+ const wxString& name)
{
wxStatusBar *statusBar = NULL;
#if wxUSE_NATIVE_STATUSBAR
- if (UsesNativeStatusBar())
+ if ( UsesNativeStatusBar() )
{
- statusBar = new wxStatusBar95(this, id, style);
+ statusBar = (wxStatusBar *)new wxStatusBar95(this, id, style);
+
+ statusBar->SetFieldsCount(number);
}
else
#endif
{
- statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
- style, name);
+ statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style, name);
// Set the height according to the font and the border size
wxClientDC dc(statusBar);
dc.SetFont(statusBar->GetFont());
- long x, y;
- dc.GetTextExtent("X", &x, &y);
+ wxCoord y;
+ dc.GetTextExtent(_T("X"), NULL, &y );
+
+ int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
- int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
+ statusBar->SetSize(-1, -1, -1, height);
- statusBar->SetSize(-1, -1, 100, height);
+ statusBar->SetFieldsCount(number);
}
- statusBar->SetFieldsCount(number);
- return statusBar;
+ return statusBar;
}
-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
- const wxString& name)
-{
- // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
- wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
- _T("recreating status bar in wxFrame") );
-
- m_frameStatusBar = OnCreateStatusBar(number, style, id,
- name);
- if ( m_frameStatusBar )
- {
- PositionStatusBar();
- return m_frameStatusBar;
- }
- else
- return NULL;
-}
-
-void wxFrame::SetStatusText(const wxString& text, int number)
+void wxFrame::PositionStatusBar()
{
- wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );
+ if ( !m_frameStatusBar )
+ return;
- m_frameStatusBar->SetStatusText(text, number);
-}
+ // native status bar positions itself, but we must forward the WM_SIZE
+ // messages to it
+#if wxUSE_NATIVE_STATUSBAR
+ wxStatusBar95 *sb = wxDynamicCast(m_frameStatusBar, wxStatusBar95);
+ if ( sb )
+ {
+ wxSizeEvent event(GetSize(), sb->GetId());
+ event.SetEventObject(sb);
-void wxFrame::SetStatusWidths(int n, const int widths_field[])
-{
- wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );
+ sb->GetEventHandler()->ProcessEvent(event);
+ }
+ else
+#endif // wxUSE_NATIVE_STATUSBAR
+ {
+ int w, h;
+ GetClientSize(&w, &h);
+ int sw, sh;
+ m_frameStatusBar->GetSize(&sw, &sh);
- m_frameStatusBar->SetStatusWidths(n, widths_field);
- PositionStatusBar();
+ // 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);
+ }
}
+#endif // wxUSE_STATUSBAR
-void wxFrame::PositionStatusBar()
+void wxFrame::DetachMenuBar()
{
- // native status bar positions itself
- if (m_frameStatusBar
-#if wxUSE_NATIVE_STATUSBAR
- && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
-#endif
- )
- {
- int w, h;
- GetClientSize(&w, &h);
- int sw, sh;
- m_frameStatusBar->GetSize(&sw, &sh);
-
- // 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);
- }
+ if (m_frameMenuBar)
+ {
+ m_frameMenuBar->Detach();
+ m_frameMenuBar = NULL;
+ }
}
-#endif // wxUSE_STATUSBAR
void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
{
if (!menu_bar)
{
- m_frameMenuBar = NULL;
+ DetachMenuBar();
return;
}
- wxCHECK_RET( !menu_bar->GetFrame(), _T("this menubar is already attached") );
+ 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 (menu_bar->GetHMenu())
+ {
+ m_hMenu = menu_bar->GetHMenu();
+ }
+ else
+ {
+ menu_bar->Detach();
+
+ m_hMenu = menu_bar->Create();
+
+ if ( !m_hMenu )
+ return;
+ }
+
+ InternalSetMenuBar();
+
+ m_frameMenuBar = menu_bar;
+ menu_bar->Attach(this);
+
+#if 0 // Old code that assumes only one call of SetMenuBar per frame.
+ if (!menu_bar)
+ {
+ DetachMenuBar();
+ return;
+ }
+
+ wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );
if (m_frameMenuBar)
delete m_frameMenuBar;
m_frameMenuBar = menu_bar;
menu_bar->Attach(this);
+#endif
}
void wxFrame::InternalSetMenuBar()
wxWindow::OnSysColourChanged(event);
}
+// Pass TRUE to show full screen, FALSE to restore.
+bool wxFrame::ShowFullScreen(bool show, long style)
+{
+ if (show)
+ {
+ if (IsFullScreen())
+ return FALSE;
+
+ m_fsIsShowing = TRUE;
+ m_fsStyle = style;
+
+ wxToolBar *theToolBar = GetToolBar();
+ wxStatusBar *theStatusBar = GetStatusBar();
+
+ int dummyWidth;
+
+ if (theToolBar)
+ theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
+ if (theStatusBar)
+ theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+
+ // zap the toolbar, menubar, and statusbar
+
+ if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
+ {
+ theToolBar->SetSize(-1,0);
+ theToolBar->Show(FALSE);
+ }
+
+ if (style & wxFULLSCREEN_NOMENUBAR)
+ SetMenu((HWND)GetHWND(), (HMENU) NULL);
+
+ // Save the number of fields in the statusbar
+ if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
+ {
+ m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+ SetStatusBar((wxStatusBar*) NULL);
+ delete theStatusBar;
+ }
+ else
+ m_fsStatusBarFields = 0;
+
+ // zap the frame borders
+
+ // save the 'normal' window style
+ m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
+
+ // save the old position, width & height, maximize state
+ m_fsOldSize = GetRect();
+ m_fsIsMaximized = IsMaximized();
+
+ // decide which window style flags to turn off
+ LONG newStyle = m_fsOldWindowStyle;
+ LONG offFlags = 0;
+
+ if (style & wxFULLSCREEN_NOBORDER)
+ offFlags |= WS_BORDER;
+ 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);
+
+ // resize to the size of the desktop
+ int width, height;
+
+ RECT rect;
+ ::GetWindowRect(GetDesktopWindow(), &rect);
+ width = rect.right - rect.left;
+ height = rect.bottom - rect.top;
+
+ SetSize(width, height);
+
+ // now flush the window style cache and actually go full-screen
+ SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
+
+ wxSizeEvent event(wxSize(width, height), GetId());
+ GetEventHandler()->ProcessEvent(event);
+
+ return TRUE;
+ }
+ else
+ {
+ if (!IsFullScreen())
+ return FALSE;
+
+ m_fsIsShowing = FALSE;
+
+ wxToolBar *theToolBar = GetToolBar();
+
+ // restore the toolbar, menubar, and statusbar
+ if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR))
+ {
+ theToolBar->SetSize(-1, m_fsToolBarHeight);
+ theToolBar->Show(TRUE);
+ }
+
+ if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
+ {
+ CreateStatusBar(m_fsStatusBarFields);
+ PositionStatusBar();
+ }
+
+ if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
+ SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
+
+ Maximize(m_fsIsMaximized);
+ SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
+ SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
+ m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
+
+ return TRUE;
+ }
+}
+
/*
* Frame window
*
// Keep this in wxFrame because it saves recoding this function
// in wxTinyFrame
-#if wxUSE_ITSY_BITSY
+#if wxUSE_ITSY_BITSY && !defined(__WIN32__)
if (style & wxTINY_CAPTION_VERT)
msflags |= IBS_VERTCAPTION;
if (style & wxTINY_CAPTION_HORIZ)
return TRUE;
}
-// Default resizing behaviour - if only ONE subwindow, resize to client
-// rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
+void wxFrame::OnActivate(wxActivateEvent& event)
{
- // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
- if ( GetAutoLayout() )
+ if ( !event.GetActive() )
{
- Layout();
- return;
- }
-#endif
+ event.Skip();
- // do we have _exactly_ one child?
- wxWindow *child = NULL;
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
- {
- wxWindow *win = node->GetData();
- if ( !win->IsTopLevel()
-#if wxUSE_STATUSBAR
- && (win != GetStatusBar())
-#endif // wxUSE_STATUSBAR
-#if wxUSE_TOOLBAR
- && (win != GetToolBar())
-#endif // wxUSE_TOOLBAR
- )
- {
- if ( child )
- return; // it's our second subwindow - nothing to do
- child = win;
- }
+ return;
}
- if ( child ) {
- // we have exactly one child - set it's size to fill the whole frame
- int clientW, clientH;
- GetClientSize(&clientW, &clientH);
+ wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
- int x = 0;
- int y = 0;
-
- child->SetSize(x, y, clientW, clientH);
- }
-}
-
-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
-{
for ( wxWindowList::Node *node = GetChildren().GetFirst();
node;
node = node->GetNext() )
)
{
child->SetFocus();
- return;
- }
- }
-}
-
-// The default implementation for the close window event.
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
- Destroy();
-}
-
-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
-{
- if (!wxPendingDelete.Member(this))
- wxPendingDelete.Append(this);
- return TRUE;
-}
-
-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
- if (GetStatusBar())
- {
- wxString help;
- int menuId = event.GetMenuId();
- if ( menuId != -1 )
- {
- wxMenuBar *menuBar = GetMenuBar();
- if (menuBar && menuBar->FindItem(menuId))
- {
- help = menuBar->GetHelpString(menuId);
- }
- }
-
- // set status text even if the string is empty - this will at
- // least remove the string from the item which was previously
- // selected
- SetStatusText(help);
- }
-}
-
-wxMenuBar *wxFrame::GetMenuBar() const
-{
- return m_frameMenuBar;
-}
-
-bool wxFrame::ProcessCommand(int id)
-{
- wxMenuBar *bar = GetMenuBar() ;
- if ( !bar )
- return FALSE;
-
- wxMenuItem *item = bar->FindItemForId(id);
- if ( !item )
- return FALSE;
-
- if ( item->IsCheckable() )
- {
- bar->Check(id, !bar->IsChecked(id)) ;
- }
-
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
- commandEvent.SetInt( id );
- commandEvent.SetEventObject( this );
-
- return GetEventHandler()->ProcessEvent(commandEvent);
-}
-
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
- wxPoint pt(0, 0);
- if (GetToolBar())
- {
- int w, h;
- GetToolBar()->GetSize(& w, & h);
-
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
- {
- pt.x += w;
- }
- else
- {
- pt.y += h;
+ break;
}
}
- return pt;
-}
-
-void wxFrame::ScreenToClient(int *x, int *y) const
-{
- wxWindow::ScreenToClient(x, y);
-
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt(GetClientAreaOrigin());
- *x -= pt.x;
- *y -= pt.y;
}
-void wxFrame::ClientToScreen(int *x, int *y) const
-{
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt1(GetClientAreaOrigin());
- *x += pt1.x;
- *y += pt1.y;
-
- wxWindow::ClientToScreen(x, y);
-}
+// ----------------------------------------------------------------------------
+// tool/status bar stuff
+// ----------------------------------------------------------------------------
#if wxUSE_TOOLBAR
+
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
- wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
- _T("recreating toolbar in wxFrame") );
-
- wxToolBar* toolBar = OnCreateToolBar(style, id, name);
- if (toolBar)
+ if ( wxFrameBase::CreateToolBar(style, id, name) )
{
- SetToolBar(toolBar);
PositionToolBar();
- return toolBar;
- }
- else
- {
- return NULL;
}
-}
-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
-{
- return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+ return m_frameToolBar;
}
void wxFrame::PositionToolBar()
RECT rect;
::GetClientRect(GetHwnd(), &rect);
+#if wxUSE_STATUSBAR
if ( GetStatusBar() )
{
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- rect.bottom -= statusY;
+ int statusX, statusY;
+ GetStatusBar()->GetClientSize(&statusX, &statusY);
+ rect.bottom -= statusY;
}
+#endif // wxUSE_STATUSBAR
- if (GetToolBar())
+ if ( GetToolBar() && GetToolBar()->IsShown() )
{
int tw, th;
- GetToolBar()->GetSize(& tw, & th);
+ GetToolBar()->GetSize(&tw, &th);
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+ if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
{
- // Use the 'real' MSW position
- GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS);
+ th = rect.bottom;
}
else
{
- // Use the 'real' MSW position
- GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS);
+ tw = rect.right;
}
+
+ // Use the 'real' MSW position here
+ GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);
}
}
#endif // wxUSE_TOOLBAR
+// ----------------------------------------------------------------------------
+// frame state (iconized/maximized/...)
+// ----------------------------------------------------------------------------
+
// 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
}
}
-
-// make the window modal (all other windows unresponsive)
-void wxFrame::MakeModal(bool modal)
-{
- if (modal) {
- wxEnableTopLevelWindows(FALSE);
- Enable(TRUE); // keep this window enabled
- }
- else {
- wxEnableTopLevelWindows(TRUE);
- }
-}
-
-
// ===========================================================================
// message processing
// ===========================================================================
if ( !m_iconized )
{
- // forward WM_SIZE to status bar control
-#if wxUSE_NATIVE_STATUSBAR
- if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
- {
- wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
- event.SetEventObject( m_frameStatusBar );
-
- ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
- }
-#endif // wxUSE_NATIVE_STATUSBAR
-
PositionStatusBar();
PositionToolBar();
return rc;
}
+
projects / wxWidgets.git / blobdiff