X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/155ecd4c4221d3bbc7aa93d472d11948f21d21ab..acd32ffcdb319f162633c20e0202db3f8542998a:/src/univ/topluniv.cpp diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp index b4ed44b881..a93554e73d 100644 --- a/src/univ/topluniv.cpp +++ b/src/univ/topluniv.cpp @@ -28,12 +28,36 @@ #include "wx/settings.h" #include "wx/bitmap.h" #include "wx/image.h" + #include "wx/frame.h" #endif #include "wx/univ/renderer.h" #include "wx/cshelp.h" #include "wx/evtloop.h" +// ---------------------------------------------------------------------------- +// wxStdTLWInputHandler: handles focus, resizing and titlebar buttons clicks +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxStdTLWInputHandler : public wxStdInputHandler +{ +public: + wxStdTLWInputHandler(wxInputHandler *inphand); + + virtual bool HandleMouse(wxInputConsumer *consumer, + const wxMouseEvent& event); + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); + virtual bool HandleActivation(wxInputConsumer *consumer, bool activated); + +private: + // the window (button) which has capture or NULL and the last hittest result + wxTopLevelWindow *m_winCapture; + long m_winHitTest; + long m_winPressed; + bool m_borderCursorOn; + wxCursor m_origCursor; +}; + // ---------------------------------------------------------------------------- // event tables @@ -56,6 +80,15 @@ int wxTopLevelWindow::ms_canIconize = -1; void wxTopLevelWindow::Init() { + // once-only ms_drawDecorations initialization + if ( ms_drawDecorations == -1 ) + { + ms_drawDecorations = + !wxSystemSettings::HasFeature(wxSYS_CAN_DRAW_FRAME_DECORATIONS) || + wxGetEnv(wxT("WXDECOR"), NULL); + } + + m_usingNativeDecorations = ms_drawDecorations == 0; m_isActive = false; m_windowStyle = 0; m_pressedButton = 0; @@ -73,21 +106,7 @@ bool wxTopLevelWindow::Create(wxWindow *parent, long styleOrig = 0, exstyleOrig = 0; - if ( ms_drawDecorations == -1 ) - { - ms_drawDecorations = - !wxSystemSettings::HasFeature(wxSYS_CAN_DRAW_FRAME_DECORATIONS) - || wxGetEnv(wxT("WXDECOR"), NULL); - // FIXME -- wxUniv should provide a way to force non-native decorations! - // $WXDECOR is just a hack in absence of better wxUniv solution - } - - if ( ms_canIconize == -1 ) - { - ms_canIconize = wxSystemSettings::HasFeature(wxSYS_CAN_ICONIZE_FRAME); - } - - if ( ms_drawDecorations ) + if ( !m_usingNativeDecorations ) { CreateInputHandler(wxINP_HANDLER_TOPLEVEL); @@ -96,16 +115,15 @@ bool wxTopLevelWindow::Create(wxWindow *parent, style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW | wxRESIZE_BORDER); - style |= wxSIMPLE_BORDER; - SetExtraStyle(exstyleOrig & - ~(wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP)); + style |= wxBORDER_NONE; + SetExtraStyle(exstyleOrig & ~wxWS_EX_CONTEXTHELP); } if ( !wxTopLevelWindowNative::Create(parent, id, title, pos, size, style, name) ) return false; - if ( ms_drawDecorations ) + if ( !m_usingNativeDecorations ) { m_windowStyle = styleOrig; m_exStyle = exstyleOrig; @@ -118,7 +136,7 @@ bool wxTopLevelWindow::ShowFullScreen(bool show, long style) { if ( show == IsFullScreen() ) return false; - if ( ms_drawDecorations ) + if ( !m_usingNativeDecorations ) { if ( show ) { @@ -137,13 +155,38 @@ bool wxTopLevelWindow::ShowFullScreen(bool show, long style) return wxTopLevelWindowNative::ShowFullScreen(show, style); } +/* static */ +void wxTopLevelWindow::UseNativeDecorationsByDefault(bool native) +{ + ms_drawDecorations = !native; +} + +void wxTopLevelWindow::UseNativeDecorations(bool native) +{ + wxASSERT_MSG( !m_windowStyle, _T("must be called before Create()") ); + + m_usingNativeDecorations = native; +} + +bool wxTopLevelWindow::IsUsingNativeDecorations() const +{ + return m_usingNativeDecorations; +} + long wxTopLevelWindow::GetDecorationsStyle() const { long style = 0; if ( m_windowStyle & wxCAPTION ) { - style |= wxTOPLEVEL_TITLEBAR | wxTOPLEVEL_BUTTON_CLOSE; + if ( ms_canIconize == -1 ) + { + ms_canIconize = wxSystemSettings::HasFeature(wxSYS_CAN_ICONIZE_FRAME); + } + + style |= wxTOPLEVEL_TITLEBAR; + if ( m_windowStyle & wxCLOSE_BOX ) + style |= wxTOPLEVEL_BUTTON_CLOSE; if ( (m_windowStyle & wxMINIMIZE_BOX) && ms_canIconize ) style |= wxTOPLEVEL_BUTTON_ICONIZE; if ( m_windowStyle & wxMAXIMIZE_BOX ) @@ -154,7 +197,7 @@ long wxTopLevelWindow::GetDecorationsStyle() const style |= wxTOPLEVEL_BUTTON_MAXIMIZE; } #if wxUSE_HELP - if ( m_exStyle & (wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP)) + if ( m_exStyle & wxWS_EX_CONTEXTHELP) style |= wxTOPLEVEL_BUTTON_HELP; #endif } @@ -186,7 +229,7 @@ void wxTopLevelWindow::RefreshTitleBar() wxPoint wxTopLevelWindow::GetClientAreaOrigin() const { - if ( ms_drawDecorations ) + if ( !m_usingNativeDecorations ) { int w, h; wxTopLevelWindowNative::DoGetClientSize(&w, &h); @@ -204,7 +247,7 @@ wxPoint wxTopLevelWindow::GetClientAreaOrigin() const void wxTopLevelWindow::DoGetClientSize(int *width, int *height) const { - if ( ms_drawDecorations ) + if ( !m_usingNativeDecorations ) { int w, h; wxTopLevelWindowNative::DoGetClientSize(&w, &h); @@ -223,7 +266,7 @@ void wxTopLevelWindow::DoGetClientSize(int *width, int *height) const void wxTopLevelWindow::DoSetClientSize(int width, int height) { - if ( ms_drawDecorations ) + if ( !m_usingNativeDecorations ) { wxSize size = m_renderer->GetFrameTotalSize(wxSize(width, height), GetDecorationsStyle()); @@ -235,9 +278,11 @@ void wxTopLevelWindow::DoSetClientSize(int width, int height) void wxTopLevelWindow::OnNcPaint(wxNcPaintEvent& event) { - if ( !ms_drawDecorations || !m_renderer ) + if ( m_usingNativeDecorations || !m_renderer ) + { event.Skip(); - else + } + else // we're drawing the decorations ourselves { // get the window rect wxRect rect(GetSize()); @@ -260,26 +305,15 @@ long wxTopLevelWindow::HitTest(const wxPoint& pt) const return m_renderer->HitTestFrame(rect, pt+GetClientAreaOrigin(), GetDecorationsStyle()); } -int wxTopLevelWindow::GetMinWidth() const +wxSize wxTopLevelWindow::GetMinSize() const { - if ( ms_drawDecorations ) + wxSize size = wxTopLevelWindowNative::GetMinSize(); + if ( !m_usingNativeDecorations ) { - return wxMax(wxTopLevelWindowNative::GetMinWidth(), - m_renderer->GetFrameMinSize(GetDecorationsStyle()).x); + size.IncTo(m_renderer->GetFrameMinSize(GetDecorationsStyle())); } - else - return wxTopLevelWindowNative::GetMinWidth(); -} -int wxTopLevelWindow::GetMinHeight() const -{ - if ( ms_drawDecorations ) - { - return wxMax(wxTopLevelWindowNative::GetMinHeight(), - m_renderer->GetFrameMinSize(GetDecorationsStyle()).y); - } - else - return wxTopLevelWindowNative::GetMinHeight(); + return size; } // ---------------------------------------------------------------------------- @@ -290,7 +324,7 @@ void wxTopLevelWindow::SetIcons(const wxIconBundle& icons) { wxTopLevelWindowNative::SetIcons(icons); - if ( ms_drawDecorations && m_renderer ) + if ( !m_usingNativeDecorations && m_renderer ) { wxSize size = m_renderer->GetFrameIconSize(); const wxIcon& icon = icons.GetIcon( size ); @@ -780,13 +814,21 @@ void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event) event.Skip(); } +/* static */ +wxInputHandler * +wxTopLevelWindow::GetStdInputHandler(wxInputHandler *handlerDef) +{ + static wxStdTLWInputHandler s_handler(handlerDef); + + return &s_handler; +} // ============================================================================ -// wxStdFrameInputHandler: handles focus, resizing and titlebar buttons clicks +// wxStdTLWInputHandler: handles focus, resizing and titlebar buttons clicks // ============================================================================ -wxStdFrameInputHandler::wxStdFrameInputHandler(wxInputHandler *inphand) - : wxStdInputHandler(inphand) +wxStdTLWInputHandler::wxStdTLWInputHandler(wxInputHandler *inphand) + : wxStdInputHandler(inphand) { m_winCapture = NULL; m_winHitTest = 0; @@ -794,8 +836,8 @@ wxStdFrameInputHandler::wxStdFrameInputHandler(wxInputHandler *inphand) m_borderCursorOn = false; } -bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event) +bool wxStdTLWInputHandler::HandleMouse(wxInputConsumer *consumer, + const wxMouseEvent& event) { // the button has 2 states: pressed and normal with the following // transitions between them: @@ -855,8 +897,8 @@ bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer, return wxStdInputHandler::HandleMouse(consumer, event); } -bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer, - const wxMouseEvent& event) +bool wxStdTLWInputHandler::HandleMouseMove(wxInputConsumer *consumer, + const wxMouseEvent& event) { if ( event.GetEventObject() == m_winCapture ) { @@ -906,8 +948,8 @@ bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer, return wxStdInputHandler::HandleMouseMove(consumer, event); } -bool wxStdFrameInputHandler::HandleActivation(wxInputConsumer *consumer, - bool activated) +bool wxStdTLWInputHandler::HandleActivation(wxInputConsumer *consumer, + bool activated) { if ( m_borderCursorOn ) {