diff options
| -rw-r--r-- | framework/source/services/backingwindow.cxx | 9 | ||||
| -rw-r--r-- | framework/source/services/backingwindow.hxx | 33 | ||||
| -rw-r--r-- | framework/uiconfig/startmodule/ui/startcenter.ui | 2 |
3 files changed, 19 insertions, 25 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 61f1328fa945..342772443636 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -221,7 +221,6 @@ IMPL_LINK( BackingWindow, WindowEventListener, VclSimpleEvent*, pEvent ) return 0; } -/* void BackingWindow::prepareRecentFileMenu() { if( ! mxPopupMenu.is() ) @@ -259,7 +258,6 @@ void BackingWindow::prepareRecentFileMenu() mpOpenButton->SetPopupMenu( pRecentMenu ); } } -*/ void BackingWindow::initBackground() { @@ -289,9 +287,8 @@ void BackingWindow::initBackground() Application::LoadBrandBitmap ("shell/backing_right", maBackgroundRight); } - // CRASH - //mpOpenButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED ); - //mpOpenButton->SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) ); + mpOpenButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED ); + mpOpenButton->SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) ); // this will be moved to somewhere saner later nSCWidth = 780; @@ -582,14 +579,12 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) return 0; } -/* IMPL_LINK( BackingWindow, ActivateHdl, Button*, pButton ) { if( pButton == mpOpenButton ) prepareRecentFileMenu(); return 0; } -*/ struct ImplDelayedDispatch { diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 2c41356b45da..ee94326cfa80 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -65,22 +65,20 @@ namespace framework com::sun::star::uno::Reference< com::sun::star::frame::XPopupMenuController > mxPopupMenuController; com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu > mxPopupMenu; - PushButton* mpWriterButton; - PushButton* mpCalcButton; - PushButton* mpImpressButton; - //MenuButton* mpOpenButton; - PushButton* mpOpenButton; - PushButton* mpDrawButton; - PushButton* mpDBButton; - PushButton* mpMathButton; - PushButton* mpTemplateButton; + PushButton* mpWriterButton; + PushButton* mpCalcButton; + PushButton* mpImpressButton; + MenuButton* mpOpenButton; + PushButton* mpDrawButton; + PushButton* mpDBButton; + PushButton* mpMathButton; + PushButton* mpTemplateButton; + PushButton* mpExtensionsButton; + PushButton* mpInfoButton; + PushButton* mpTplRepButton; - PushButton* mpExtensionsButton; - PushButton* mpInfoButton; - PushButton* mpTplRepButton; - - VclGrid* mpStartCenterContainer; + VclGrid* mpStartCenterContainer; BitmapEx maBackgroundLeft; BitmapEx maBackgroundMiddle; @@ -135,13 +133,14 @@ namespace framework DECL_LINK( ClickHdl, Button* ); DECL_LINK( ExtLinkClickHdl, Button* ); - //DECL_LINK( ActivateHdl, Button* ); + DECL_LINK( ActivateHdl, Button* ); DECL_LINK( WindowEventListener, VclSimpleEvent* ); void initControls(); void initBackground(); - //void prepareRecentFileMenu(); - public: + void prepareRecentFileMenu(); + + public: BackingWindow( Window* pParent ); ~BackingWindow(); diff --git a/framework/uiconfig/startmodule/ui/startcenter.ui b/framework/uiconfig/startmodule/ui/startcenter.ui index 1a4d9d6a4895..33c6e17dce0d 100644 --- a/framework/uiconfig/startmodule/ui/startcenter.ui +++ b/framework/uiconfig/startmodule/ui/startcenter.ui @@ -185,7 +185,7 @@ </packing> </child> <child> - <object class="GtkButton" id="open"> + <object class="GtkButton" id="open:addmenu"> <property name="label" translatable="yes">Ope_n...</property> <property name="visible">True</property> <property name="can_focus">True</property> |