X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaebb052008174a0a8a7db1a304f7d3e935ec17..1721a8c028d3b6a553634c632117fbfac102a30e:/contrib/src/fl/controlbar.cpp?ds=sidebyside diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp index 98474b8271..9183ec91d3 100644 --- a/contrib/src/fl/controlbar.cpp +++ b/contrib/src/fl/controlbar.cpp @@ -258,10 +258,6 @@ BEGIN_EVENT_TABLE( wxFrameLayout, wxEvtHandler ) EVT_LEFT_DCLICK( wxFrameLayout::OnLDblClick ) EVT_IDLE ( wxFrameLayout::OnIdle ) - EVT_SET_FOCUS ( wxFrameLayout::OnSetFocus ) - EVT_KILL_FOCUS ( wxFrameLayout::OnKillFocus ) - - EVT_ACTIVATE ( wxFrameLayout::OnActivate ) EVT_ERASE_BACKGROUND( wxFrameLayout::OnEraseBackground ) @@ -913,7 +909,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar ) wxPoint( 50,50 ), wxSize ( 0, 0 ), wxFRAME_FLOAT_ON_PARENT | - wxFRAME_TOOL_WINDOW | + wxNO_BORDER | wxFRAME_NO_TASKBAR ); @@ -1505,38 +1501,6 @@ void wxFrameLayout::OnIdle( wxIdleEvent& event ) event.Skip(); } - -void wxFrameLayout::OnKillFocus( wxFocusEvent& WXUNUSED(event) ) -{ - //wxMessageBox( "wxFrameLayoutGot Kill Focus!" ); - //ShowFloatedWindows( false ); -} - -void wxFrameLayout::OnSetFocus( wxFocusEvent& WXUNUSED(event) ) -{ - //ShowFloatedWindows( true ); -} - -void wxFrameLayout::OnActivate( wxActivateEvent& WXUNUSED(event) ) -{ -#if 0 - if ( event.GetActive() == false ) - { - wxWindow* focus = wxWindow::FindFocus(); - - if ( !focus || focus == &GetParentFrame() ) - { - mCheckFocusWhenIdle = true; - - if ( !focus ) - - wxMessageBox("Deactivated!" ); - - } - } -#endif -} - void wxFrameLayout::GetPaneProperties( cbCommonPaneProperties& props, int alignment ) { props = mPanes[alignment]->mProps; @@ -1594,11 +1558,11 @@ void wxFrameLayout::FirePluginEvent( cbPluginEvent& event ) { bool isInputEvt = true; #if wxCHECK_VERSION(2,3,0) - if ( event.m_eventType != cbEVT_PL_LEFT_DOWN && - event.m_eventType != cbEVT_PL_LEFT_UP && - event.m_eventType != cbEVT_PL_RIGHT_DOWN && - event.m_eventType != cbEVT_PL_RIGHT_UP && - event.m_eventType != cbEVT_PL_MOTION ) + if ( event.GetEventType() != cbEVT_PL_LEFT_DOWN && + event.GetEventType() != cbEVT_PL_LEFT_UP && + event.GetEventType() != cbEVT_PL_RIGHT_DOWN && + event.GetEventType() != cbEVT_PL_RIGHT_UP && + event.GetEventType() != cbEVT_PL_MOTION ) isInputEvt = false; #else switch ( event.m_eventType )