// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "frame.h"
#endif
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)
+ wxFLAGS_MEMBER(wxTHICK_FRAME)
+ wxFLAGS_MEMBER(wxSYSTEM_MENU)
+ wxFLAGS_MEMBER(wxRESIZE_BORDER)
+ wxFLAGS_MEMBER(wxRESIZE_BOX)
+ 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 , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , , 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
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
#endif
-#ifdef __WXWINCE__
- m_commandBar = 0;
-#endif
// Data to save/restore when calling ShowFullScreen
m_fsStatusBarFields = 0;
{
m_isBeingDeleted = TRUE;
DeleteAllBars();
-#ifdef __WXWINCE__
- RemoveCommandBar();
-#endif
-
}
// ----------------------------------------------------------------------------
}
else // set new non NULL menu bar
{
+#ifndef __WXWINCE__
// Can set a menubar several times.
if ( menubar->GetHMenu() )
{
return;
}
}
-
+#endif
InternalSetMenuBar();
}
}
#ifdef __WXMICROWIN__
// Nothing
#elif defined(__WXWINCE__)
-
- CreateCommandBar() ;
- if (m_commandBar)
+ if (!GetToolBar())
{
- if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL,
- (LPTSTR) (HMENU) m_hMenu, 0))
- {
- wxFAIL_MSG( _T("failed to set menubar") );
- return;
- }
- CommandBar_DrawMenuBar((HWND) m_commandBar, 0);
+ wxToolBar* toolBar = new wxToolBar(this, -1,
+ wxDefaultPosition, wxDefaultSize,
+ wxBORDER_NONE | wxTB_HORIZONTAL,
+ wxToolBarNameStr, GetMenuBar());
+ SetToolBar(toolBar);
}
#else
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
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();
}
#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__
}
}
return GetEventHandler()->ProcessEvent(event);
}
-
-#ifdef __WXWINCE__
-WXHWND wxFrame::CreateCommandBar()
-{
- if (m_commandBar)
- return m_commandBar;
-
- m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), GetHwnd(), NewControlId());
- if (!m_commandBar)
- {
- wxFAIL_MSG( _T("failed to create commandbar") );
- return 0;
- }
- return m_commandBar;
-}
-
-void wxFrame::RemoveCommandBar()
-{
- if (m_commandBar)
- {
- ::DestroyWindow((HWND) m_commandBar);
- m_commandBar = NULL;
- }
-}
-#endif
-
-
projects / wxWidgets.git / blobdiff