#include "wx/settings.h"
#include "wx/app.h"
+#include <wx/mac/uma.h>
+
extern wxList wxModelessWindows;
extern wxList wxPendingDelete;
wxFrame::wxFrame()
{
+#if wxUSE_TOOLBAR
m_frameToolBar = NULL ;
+#endif
+
+ // in order to be able to give size events on show
m_frameMenuBar = NULL;
m_frameStatusBar = NULL;
-
- m_windowParent = NULL;
m_iconized = FALSE;
+ m_isShown = FALSE;
}
bool wxFrame::Create(wxWindow *parent,
SetName(name);
m_windowStyle = style;
m_frameMenuBar = NULL;
+ m_isShown = FALSE;
+
+#if wxUSE_TOOLBAR
m_frameToolBar = NULL ;
+#endif
m_frameStatusBar = NULL;
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this);
- // TODO: create frame.
-
- return FALSE;
+ // create frame.
+
+ Rect theBoundsRect;
+
+ m_x = (int)pos.x;
+ m_y = (int)pos.y;
+ if ( m_y < 50 )
+ m_y = 50 ;
+ if ( m_x < 20 )
+ m_x = 20 ;
+
+ m_width = size.x;
+ if (m_width == -1)
+ m_width = 20;
+ m_height = size.y;
+ if (m_height == -1)
+ m_height = 20;
+
+ m_macWindowData = new MacWindowData() ;
+
+ ::SetRect(&theBoundsRect, m_x, m_y, m_x + m_width, m_y + m_height);
+
+ WindowClass wclass = kDocumentWindowClass ;
+ WindowAttributes attr = kWindowNoAttributes ;
+
+ if ( ( m_windowStyle & wxMINIMIZE_BOX ) || ( m_windowStyle & wxMAXIMIZE_BOX ) )
+ {
+ attr |= kWindowFullZoomAttribute ;
+ attr |= kWindowResizableAttribute ;
+ }
+ if ( m_windowStyle & wxSTAY_ON_TOP )
+ {
+ wclass = kFloatingWindowClass ;
+
+// if ( m_windowStyle & wxCAPTION )
+// attr |= kHasPaletteTitlebarMask ;
+ }
+ else
+ {
+ }
+ if ( m_windowStyle & wxSYSTEM_MENU )
+ {
+ attr |= kWindowCloseBoxAttribute ;
+ }
+ UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
+ wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
+ wxString label ;
+ if( wxApp::s_macDefaultEncodingIsPC )
+ label = wxMacMakeMacStringFromPC( title ) ;
+ else
+ label = title ;
+ UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
+ UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
+ m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+ m_macWindowData->m_macFocus = NULL ;
+ return TRUE;
}
wxFrame::~wxFrame()
if (wxTheApp->GetExitOnFrameDelete())
{
- // TODO signal to the app that we're going to close
+ wxTheApp->ExitMainLoop() ;
}
}
wxModelessWindows.DeleteObject(this);
}
-// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::GetClientSize(int *x, int *y) const
-{
- // TODO
-}
-
-// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
-void wxFrame::SetClientSize(int width, int height)
-{
- // TODO
-}
-
-void wxFrame::GetSize(int *width, int *height) const
-{
- // TODO
-}
-
-void wxFrame::GetPosition(int *x, int *y) const
-{
- // TODO
-}
-
-void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- // TODO
-}
-
-bool wxFrame::Show(bool show)
-{
- // TODO
- return FALSE;
-}
void wxFrame::Iconize(bool iconize)
{
return FALSE;
}
-void wxFrame::SetTitle(const wxString& title)
-{
- // TODO
-}
-
-wxString wxFrame::GetTitle() const
-{
- // TODO
- return wxString("");
-}
-
void wxFrame::SetIcon(const wxIcon& icon)
{
m_icon = icon;
{
wxStatusBar *statusBar = NULL;
- statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
+ statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 17),
style, name);
// Set the height according to the font and the border size
+ // we shouldn't do this on the mac, because we have to fit the grow box
+ /*
wxClientDC dc(statusBar);
dc.SetFont(statusBar->GetFont());
statusBar->SetSize(-1, -1, 100, height);
+ */
+
statusBar->SetFieldsCount(number);
return statusBar;
}
void wxFrame::PositionStatusBar()
{
+ if (m_frameStatusBar )
+ {
int w, h;
GetClientSize(&w, &h);
int 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);
+ }
}
void wxFrame::SetMenuBar(wxMenuBar *menuBar)
}
m_frameMenuBar = menuBar;
-
- // TODO
+ // TODO : we move this into the app code
+ m_frameMenuBar->MacInstallMenuBar() ;
}
void wxFrame::Fit()
wxWindow *win = (wxWindow *)node->Data();
if ( !win->IsKindOf(CLASSINFO(wxFrame)) &&
!win->IsKindOf(CLASSINFO(wxDialog)) &&
- (win != GetStatusBar()) &&
- (win != GetToolBar()) )
+ (win != GetStatusBar())
+#if wxUSE_TOOLBAR
+ &&
+ (win != GetToolBar())
+#endif
+ )
{
if ( child )
return; // it's our second subwindow - nothing to do
}
}
-// The default implementation for the close window event - calls
-// OnClose for backward compatibility.
-
+// The default implementation for the close window event.
void wxFrame::OnCloseWindow(wxCloseEvent& event)
{
- // Compatibility
- if ( GetEventHandler()->OnClose() || event.GetForce())
- {
- this->Destroy();
- }
-}
-
-bool wxFrame::OnClose()
-{
- return TRUE;
+ this->Destroy();
}
// Destroy the window (delayed, if a managed window)
return m_frameMenuBar;
}
-void wxFrame::Centre(int direction)
-{
- int display_width, display_height, width, height, x, y;
- wxDisplaySize(&display_width, &display_height);
-
- GetSize(&width, &height);
- GetPosition(&x, &y);
-
- if (direction & wxHORIZONTAL)
- x = (int)((display_width - width)/2);
- if (direction & wxVERTICAL)
- y = (int)((display_height - height)/2);
-
- SetSize(x, y, width, height);
-}
// Call this to simulate a menu command
void wxFrame::Command(int id)
void wxFrame::ProcessCommand(int id)
{
- wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id);
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
commandEvent.SetInt( id );
commandEvent.SetEventObject( this );
wxPoint wxFrame::GetClientAreaOrigin() const
{
wxPoint pt(0, 0);
+#if wxUSE_TOOLBAR
if (GetToolBar())
{
int w, h;
pt.y += h;
}
}
+#endif
return pt;
}
-void wxFrame::ScreenToClient(int *x, int *y) const
+void wxFrame::DoGetClientSize(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;
+ wxWindow::DoGetClientSize( x , y ) ;
+
+ if ( GetStatusBar() )
+ {
+ int statusX, statusY;
+ GetStatusBar()->GetClientSize(&statusX, &statusY);
+ *y -= statusY;
+ }
+
+ wxPoint pt(GetClientAreaOrigin());
+ *y -= pt.y;
+ *x -= pt.x;
}
-void wxFrame::ClientToScreen(int *x, int *y) const
+void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
{
- // 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);
+ int currentclientwidth , currentclientheight ;
+ int currentwidth , currentheight ;
+
+ GetClientSize( ¤tclientwidth , ¤tclientheight ) ;
+ GetSize( ¤twidth , ¤theight ) ;
+
+ // find the current client size
+
+ // 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
+
+ DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+ currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
}
+
+#if wxUSE_TOOLBAR
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
// the toolbar/status bar were added.
// So DEFINITELY replace the line below with something appropriate.
- GetClientSize(& cw, &ch);
+ // GetClientSize(& cw, &ch);
+
+ cw = m_width ;
+ ch = m_height ;
if ( GetStatusBar() )
{
}
}
}
-
+#endif
projects / wxWidgets.git / blobdiff