INTEGRATION: CWS layoutdialogs (1.2.6); FILE MERGED
2008/07/30 11:12:22 rt 1.2.6.3: Update license header. 2008/03/28 09:51:22 cl 1.2.6.2: merged tklayout into tk lib 2008/03/20 11:56:25 jcn 1.2.6.1: Update from http://lilypond.org/~janneke/vc/toolkit.git/.git 2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> * source/awt/vclxwindow.cxx: Fix compile warning. 2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> * util/makefile.mk: Revert obsolete VERSION addition. 2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> * source/controls/dialogcontrol.cxx, source/controls/unocontrol.cxx, source/helper/tkresmgr.cxx, util/defs/wntmsci11: Revert weird initial patch. 2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO: Doc update. 2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, inc/layout/layout.hxx, source/awt/vclxbutton.cxx, source/vclcompat/wbutton.cxx, workben/layout/recover.xml: Implement MoreButton. TODO: images. 2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> * source/vclcompat/wbutton.cxx: Remove redraw cruft, rename redrawAlready to redraw. 2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, source/vclcompat/wbutton.cxx: Step towards cleaner redraw. 2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, inc/layout/layout.hxx, source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, source/layout/helper.cxx, source/vclcompat/wbutton.cxx, workben/layout/recover.cxx, workben/layout/recover.hxx: Extract AdvancedButton implementation from recover.cxx into new widget. 2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/recover.cxx, workben/layout/recover.hxx, workben/layout/recover.xml: Update recover dialog, make advanced/simple switching work. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/zoom.cxx: In test mode, enable everything. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/localize.sdf: Manually add new translatable strings and translations for de, nl. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/zoom.xml: Update zoom to have hbox of Zoom factor and View layout alongside each other. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/zoom.cxx, workben/layout/zoom.hxx, workben/layout/zoom.xml: Merge upstream's zoom. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * source/vclcompat/wbutton.cxx, source/vclcompat/wrapper.hxx: Nitpick, debugging aid. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout.hxx, source/vclcompat/wrapper.cxx: Implement FixedLine.IsEnabled(). 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * util/makefile.mk: Build lib name fix. 2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, inc/layout/layout.hxx, source/vclcompat/wcontainer.cxx, workben/layout/recover.cxx, workben/layout/recover.hxx, workben/layout/recover.xml: Complete VBox/HBox wrappers. Not use them in recover, spacing still wrong. 2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, workben/layout/recover.cxx, workben/layout/recover.hxx, workben/layout/recover.xml: More recovery dialog mockuping. 2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org> * source/layout/box-base.cxx: Implement visibility of elements/containers better. 2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, inc/layout/layout.hxx, source/layout/helper.cxx, source/layout/import.cxx, source/layout/proplist.cxx, source/vclcompat/wbutton.cxx, source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx: Implement FixedImage. Needed for recovery dialog. 2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org> * source/layout/box-base.hxx, workben/layout/editor.cxx: Give ChildData virtual distructor. 2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, inc/layout/layout.hxx, source/layout/helper.cxx, source/vclcompat/makefile.mk, source/vclcompat/wrapper.cxx, util/makefile.mk, workben/layout/makefile.mk, workben/layout/recover.cxx, workben/layout/recover.hxx, workben/layout/recover.xml, workben/layout/test.cxx: Stab at new recover dialog. 2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/editor.cxx: Do not clear fresh container. Disable debug printing. 2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, workben/layout/localize.sdf: Fix localize.sdf for wordcount. 2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-pre.hxx, source/layout/dialogbuttonhbox.cxx: Fix ID for displaying dialogs. 2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, workben/layout/localize.sdf, workben/layout/wordcount.xml, workben/layout/zoom.xml: Add strings for all languages. 2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, source/layout/box-base.cxx, source/layout/box-base.hxx, source/layout/box.cxx, source/layout/box.hxx, source/layout/container.cxx, source/layout/dialogbuttonhbox.cxx, source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx, source/layout/flow.cxx, source/layout/helper.cxx, source/layout/import.hxx, source/layout/makefile.mk, source/layout/proplist.cxx, source/layout/root.cxx, source/layout/table.cxx, source/layout/table.hxx, source/layout/timer.cxx, source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx: Clean-up code duplication from layout: new Box_Base class implements addChild, removeChild, getChildren, getChildProperties for Box, Table, VCLXSplitter, VCLXTabControl. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, source/layout/root.cxx: Document more fixmes. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, source/layout/proplist.cxx: Remove m237 workaround. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * source/layout/helper.cxx: More comment cleanups. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * source/awt/vclxtabcontrol.cxx, source/layout/box.cxx, source/layout/container.cxx, source/vclcompat/wrapper.cxx: Commented-out code cleanups. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, inc/layout/layout.hxx, inc/layout/layoutcore.hxx, source/awt/forward.hxx, source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, source/layout/bin.cxx, source/layout/bin.hxx, source/layout/box.cxx, source/layout/box.hxx, source/layout/container.cxx, source/layout/container.hxx, source/layout/dialogbuttonhbox.cxx, source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx, source/layout/factory.hxx, source/layout/flow.cxx, source/layout/flow.hxx, source/layout/helper.cxx, source/layout/helper.hxx, source/layout/import.cxx, source/layout/import.hxx, source/layout/makefile.mk, source/layout/precompiled_xmlscript.hxx, source/layout/proplist.cxx, source/layout/proplist.hxx, source/layout/root.cxx, source/layout/root.hxx, source/layout/table.cxx, source/layout/table.hxx, source/layout/timer.cxx, source/layout/timer.hxx, source/layout/translate.cxx, source/layout/translate.hxx, source/vclcompat/makefile.mk, source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx, workben/layout/editor.cxx, workben/layout/editor.hxx, workben/layout/makefile.mk, workben/layout/simple-paragraph.cxx, workben/layout/simple-paragraph.hxx, workben/layout/test.cxx, workben/layout/uno.hxx, workben/layout/zoom_def.hxx: Add licence headers. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * workben/layout/meekfile.mk: Junk meekfile.mk 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO: Update TODO. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx, source/awt/vclxwindows.cxx: Move VCLXScrollBar's getMinimumSize() from VCLXWindow's switch to method. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx, source/awt/vclxwindows.cxx: Move VCLXMessageBox's getMinimumSize() from VCLXWindow's switch to method. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, inc/toolkit/awt/vclxtopwindow.hxx, source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, source/awt/vclxtopwindow.cxx: Remove code duplication from VCLXDialog. 2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> * source/awt/vclxdialog.cxx, source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx, source/vclcompat/wrapper.hxx: Comment cleanup. 2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, source/layout/helper.hxx, workben/layout/editor.cxx, workben/layout/wordcountdialog.cxx: Fix remaining SUN warnings. 2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org> * inc/layout/layout.hxx, source/awt/vclxfixedline.hxx, source/layout/byteseq.cxx, source/layout/helper.hxx, source/layout/import.cxx, source/layout/makefile.mk, source/layout/proplist.cxx, source/layout/translate.hxx, source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx, workben/layout/editor.cxx: Fix some sunstudio12 warnings. 2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org> * doc/layout/TODO, source/awt/makefile.mk, source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx, source/layout/helper.cxx: Junk VCLXProxy. 2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org> * inc/toolkit/awt/vclxwindows.hxx, inc/toolkit/helper/listenermultiplexer.hxx, source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, source/layout/helper.cxx: Hello world on AWTVCLXCancelButton() label and images. 2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org> * .gitignore, source/awt/forward.hxx, source/awt/makefile.mk, source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, source/layout/makefile.mk, workben/layout/localize-de.sdf, workben/layout/localize-nl.sdf: Cleanup of includes, namespace in headers in awt.
This commit is contained in:
Rüdiger Timm
parent
2be1563838
commit
af12f0b8cd
1 changed files with 132 additions and 57 deletions
|
|
@ -1,10 +1,40 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* Copyright 2008 by Sun Microsystems, Inc.
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: layout.hxx,v $
|
||||
*
|
||||
* $Revision: 1.3 $
|
||||
*
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
* OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License version 3
|
||||
* only, as published by the Free Software Foundation.
|
||||
*
|
||||
* OpenOffice.org is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License version 3 for more details
|
||||
* (a copy is included in the LICENSE file that accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* version 3 along with OpenOffice.org. If not, see
|
||||
* <http://www.openoffice.org/license.html>
|
||||
* for a copy of the LGPLv3 License.
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
#ifndef _LAYOUT_HXX
|
||||
#define _LAYOUT_HXX
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
|
||||
#include <com/sun/star/uno/XInterface.hpp>
|
||||
#include <com/sun/star/awt/XLayoutContainer.hpp>
|
||||
#include <com/sun/star/util/Color.hpp>
|
||||
#include <tools/link.hxx>
|
||||
#include <tools/string.hxx>
|
||||
|
||||
|
|
@ -16,6 +46,7 @@
|
|||
#include <toolkit/dllapi.h>
|
||||
|
||||
class Window;
|
||||
class Image;
|
||||
|
||||
namespace layout
|
||||
{
|
||||
|
|
@ -28,32 +59,22 @@ class TOOLKIT_DLLPUBLIC Context
|
|||
{
|
||||
ContextImpl *pImpl;
|
||||
public:
|
||||
Context( const char *pPath );
|
||||
Context( char const* pPath );
|
||||
~Context();
|
||||
PeerHandle GetPeerHandle( const char *pId, sal_uInt32 nId = 0 ) const;
|
||||
PeerHandle GetPeerHandle( char const* pId, sal_uInt32 nId = 0 ) const;
|
||||
void setToplevel( PeerHandle xToplevel );
|
||||
PeerHandle getToplevel();
|
||||
PeerHandle getRoot();
|
||||
};
|
||||
|
||||
class ImageImpl;
|
||||
class TOOLKIT_DLLPUBLIC Image
|
||||
{
|
||||
ImageImpl *pImpl;
|
||||
public:
|
||||
Image( const char *pName );
|
||||
~Image();
|
||||
ImageImpl &getImpl() const { return *pImpl; }
|
||||
};
|
||||
|
||||
// make declaring wrappers easier ...
|
||||
#define DECL_CONSTRUCTORS(t,par,defaultWinBit) \
|
||||
protected: \
|
||||
explicit t( WindowImpl *pImpl ) : \
|
||||
par( pImpl ) {} \
|
||||
const char *GetUnoName() const; \
|
||||
char const* GetUnoName() const; \
|
||||
public: \
|
||||
t( Context *pCtx, const char *pId, sal_uInt32 nId = 0 ); \
|
||||
t( Context *pCtx, char const* pId, sal_uInt32 nId = 0 ); \
|
||||
t( Window *pParent, WinBits nStyle = defaultWinBit )
|
||||
#define DECL_GET_IMPL(t) \
|
||||
inline t##Impl &getImpl() const
|
||||
|
|
@ -61,12 +82,12 @@ public:
|
|||
// follows the VCL inheritance hierarchy ...
|
||||
|
||||
class WindowImpl;
|
||||
class TOOLKIT_DLLPUBLIC TOOLKIT_DLLPUBLIC Window
|
||||
class TOOLKIT_DLLPUBLIC Window
|
||||
{
|
||||
protected:
|
||||
WindowImpl *mpImpl;
|
||||
static PeerHandle CreatePeer( Window *pParent, WinBits nStyle,
|
||||
const char *pName);
|
||||
char const* pName);
|
||||
public:
|
||||
PeerHandle GetPeer();
|
||||
Context *getContext();
|
||||
|
|
@ -91,7 +112,7 @@ class TOOLKIT_DLLPUBLIC Control : public Window
|
|||
DECL_GET_IMPL( Control );
|
||||
DECL_CONSTRUCTORS( Control, Window, 0 );
|
||||
public:
|
||||
// void SetText( const String& rStr ); - can't do this here ...
|
||||
// void SetText( String const& rStr ); - can't do this here ...
|
||||
};
|
||||
|
||||
class FixedLineImpl;
|
||||
|
|
@ -100,6 +121,8 @@ class TOOLKIT_DLLPUBLIC FixedLine : public Control
|
|||
friend class FixedLineImpl;
|
||||
DECL_GET_IMPL( FixedLine );
|
||||
DECL_CONSTRUCTORS( FixedLine, Control, WB_HORZ );
|
||||
public:
|
||||
bool IsEnabled();
|
||||
};
|
||||
|
||||
class FixedTextImpl;
|
||||
|
|
@ -109,7 +132,17 @@ class TOOLKIT_DLLPUBLIC FixedText : public Control
|
|||
DECL_GET_IMPL( FixedText );
|
||||
DECL_CONSTRUCTORS( FixedText, Control, 0 );
|
||||
public:
|
||||
void SetText( const String& rStr );
|
||||
void SetText( String const& rStr );
|
||||
};
|
||||
|
||||
class FixedImageImpl;
|
||||
class TOOLKIT_DLLPUBLIC FixedImage : public Control
|
||||
{
|
||||
friend class FixedImageImpl;
|
||||
DECL_GET_IMPL( FixedImage );
|
||||
DECL_CONSTRUCTORS( FixedImage, Control, 0 );
|
||||
public:
|
||||
void setImage( ::Image const& );
|
||||
};
|
||||
|
||||
class FixedInfoImpl;
|
||||
|
|
@ -120,6 +153,16 @@ class TOOLKIT_DLLPUBLIC FixedInfo : public FixedText
|
|||
DECL_CONSTRUCTORS( FixedInfo, FixedText, 0 );
|
||||
};
|
||||
|
||||
class ImageImpl;
|
||||
class TOOLKIT_DLLPUBLIC Image
|
||||
{
|
||||
ImageImpl *pImpl;
|
||||
public:
|
||||
Image( char const* pName );
|
||||
~Image();
|
||||
ImageImpl &getImpl() const { return *pImpl; }
|
||||
};
|
||||
|
||||
class ButtonImpl;
|
||||
class TOOLKIT_DLLPUBLIC Button : public Control
|
||||
{
|
||||
|
|
@ -127,11 +170,11 @@ class TOOLKIT_DLLPUBLIC Button : public Control
|
|||
DECL_GET_IMPL( Button );
|
||||
DECL_CONSTRUCTORS( Button, Control, 0 );
|
||||
public:
|
||||
void SetText( const String& rStr );
|
||||
void SetText( String const& rStr );
|
||||
BOOL SetModeImage( const Image& rImage );
|
||||
void SetImageAlign( ImageAlign eAlign );
|
||||
|
||||
void SetClickHdl( const Link& rLink );
|
||||
void SetClickHdl( Link const& rLink );
|
||||
virtual void Click() /* pure virtual? */;
|
||||
};
|
||||
|
||||
|
|
@ -145,7 +188,7 @@ public:
|
|||
BOOL IsChecked() const;
|
||||
|
||||
void Toggle();
|
||||
void SetToggleHdl( const Link& rLink );
|
||||
void SetToggleHdl( Link const& rLink );
|
||||
};
|
||||
|
||||
class TOOLKIT_DLLPUBLIC OKButton : public PushButton
|
||||
|
|
@ -185,6 +228,27 @@ class TOOLKIT_DLLPUBLIC HelpButton : public PushButton
|
|||
DECL_CONSTRUCTORS( HelpButton, PushButton, 0 );
|
||||
};
|
||||
|
||||
class AdvancedButtonImpl;
|
||||
class TOOLKIT_DLLPUBLIC AdvancedButton : public PushButton
|
||||
{
|
||||
DECL_CONSTRUCTORS( AdvancedButton, PushButton, 0 );
|
||||
DECL_GET_IMPL( AdvancedButton );
|
||||
|
||||
void AddAdvanced( Window* w );
|
||||
void AddSimple( Window* w );
|
||||
void RemoveAdvanced( Window* w );
|
||||
void RemoveSimple( Window* w );
|
||||
};
|
||||
|
||||
class MoreButtonImpl;
|
||||
class TOOLKIT_DLLPUBLIC MoreButton : public AdvancedButton
|
||||
{
|
||||
DECL_CONSTRUCTORS( MoreButton, AdvancedButton, 0 );
|
||||
DECL_GET_IMPL( MoreButton );
|
||||
void AddWindow( Window* w );
|
||||
void RemoveWindow( Window* w );
|
||||
};
|
||||
|
||||
class RadioButtonImpl;
|
||||
class TOOLKIT_DLLPUBLIC RadioButton : public Button
|
||||
{
|
||||
|
|
@ -195,11 +259,11 @@ public:
|
|||
BOOL IsChecked() const;
|
||||
|
||||
void Toggle();
|
||||
void SetToggleHdl( const Link& rLink );
|
||||
void SetToggleHdl( Link const& rLink );
|
||||
};
|
||||
|
||||
class CheckBoxImpl;
|
||||
class TOOLKIT_DLLPUBLIC TOOLKIT_DLLPUBLIC CheckBox : public Button
|
||||
class TOOLKIT_DLLPUBLIC CheckBox : public Button
|
||||
{
|
||||
DECL_GET_IMPL( CheckBox );
|
||||
DECL_CONSTRUCTORS( CheckBox, Button, 0 );
|
||||
|
|
@ -208,7 +272,7 @@ public:
|
|||
BOOL IsChecked() const;
|
||||
|
||||
void Toggle();
|
||||
void SetToggleHdl( const Link& rLink );
|
||||
void SetToggleHdl( Link const& rLink );
|
||||
};
|
||||
|
||||
class EditImpl;
|
||||
|
|
@ -217,9 +281,9 @@ class TOOLKIT_DLLPUBLIC Edit : public Control
|
|||
DECL_GET_IMPL( Edit );
|
||||
DECL_CONSTRUCTORS( Edit, Control, WB_BORDER );
|
||||
public:
|
||||
void SetText( const XubString& rStr ) const;
|
||||
void SetText( XubString const& rStr ) const;
|
||||
XubString GetText() const;
|
||||
void SetModifyHdl( const Link& rLink );
|
||||
void SetModifyHdl( Link const& rLink );
|
||||
};
|
||||
|
||||
class MultiLineEditImpl;
|
||||
|
|
@ -267,7 +331,7 @@ class TOOLKIT_DLLPUBLIC NumericField : public SpinField, public NumericFormatter
|
|||
{
|
||||
DECL_GET_IMPL( NumericField );
|
||||
public:
|
||||
NumericField( Context *pCtx, const char *pId, sal_uInt32 nId = 0 );
|
||||
NumericField( Context *pCtx, char const* pId, sal_uInt32 nId = 0 );
|
||||
NumericField( Window *pParent, WinBits nStyle );
|
||||
};
|
||||
|
||||
|
|
@ -294,7 +358,7 @@ class TOOLKIT_DLLPUBLIC MetricField : public SpinField, public MetricFormatter
|
|||
{
|
||||
DECL_GET_IMPL( MetricField );
|
||||
public:
|
||||
MetricField( Context *pCtx, const char *pId, sal_uInt32 nId = 0 );
|
||||
MetricField( Context *pCtx, char const* pId, sal_uInt32 nId = 0 );
|
||||
MetricField( Window *pParent, WinBits nStyle );
|
||||
};
|
||||
|
||||
|
|
@ -307,17 +371,17 @@ class TOOLKIT_DLLPUBLIC ComboBox : public Edit
|
|||
DECL_CONSTRUCTORS( ComboBox, Edit, 0 );
|
||||
|
||||
public:
|
||||
USHORT InsertEntry( const XubString& rStr, USHORT nPos = COMBOBOX_APPEND );
|
||||
void RemoveEntry( const XubString& rStr );
|
||||
USHORT InsertEntry( XubString const& rStr, USHORT nPos = COMBOBOX_APPEND );
|
||||
void RemoveEntry( XubString const& rStr );
|
||||
void RemoveEntry( USHORT nPos );
|
||||
void Clear();
|
||||
|
||||
USHORT GetEntryPos( const XubString& rStr ) const;
|
||||
USHORT GetEntryPos( XubString const& rStr ) const;
|
||||
XubString GetEntry( USHORT nPos ) const;
|
||||
USHORT GetEntryCount() const;
|
||||
|
||||
void SetClickHdl( const Link& rLink );
|
||||
void SetSelectHdl( const Link& rLink );
|
||||
void SetClickHdl( Link const& rLink );
|
||||
void SetSelectHdl( Link const& rLink );
|
||||
};
|
||||
|
||||
#define LISTBOX_APPEND ((USHORT)0xFFFF)
|
||||
|
|
@ -328,25 +392,25 @@ class TOOLKIT_DLLPUBLIC ListBox : public Control
|
|||
DECL_GET_IMPL( ListBox );
|
||||
DECL_CONSTRUCTORS( ListBox, Control, WB_BORDER );
|
||||
public:
|
||||
USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
|
||||
USHORT InsertEntry( XubString const& rStr, USHORT nPos = LISTBOX_APPEND );
|
||||
|
||||
void RemoveEntry( const XubString& rStr );
|
||||
void RemoveEntry( XubString const& rStr );
|
||||
void RemoveEntry( USHORT nPos );
|
||||
void Clear();
|
||||
|
||||
USHORT GetEntryPos( const XubString& rStr ) const;
|
||||
USHORT GetEntryPos( XubString const& rStr ) const;
|
||||
XubString GetEntry( USHORT nPos ) const;
|
||||
USHORT GetEntryCount() const;
|
||||
|
||||
void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE );
|
||||
void SelectEntry( XubString const& rStr, BOOL bSelect = TRUE );
|
||||
void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
|
||||
|
||||
USHORT GetSelectEntryCount() const;
|
||||
XubString GetSelectEntry( USHORT nSelIndex = 0 ) const;
|
||||
USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
|
||||
|
||||
void SetSelectHdl( const Link& rLink );
|
||||
void SetClickHdl( const Link& rLink );
|
||||
void SetSelectHdl( Link const& rLink );
|
||||
void SetClickHdl( Link const& rLink );
|
||||
};
|
||||
|
||||
class DialogImpl;
|
||||
|
|
@ -356,11 +420,24 @@ class TOOLKIT_DLLPUBLIC Dialog : public Context, public Window
|
|||
void SetParent( Window *pParent );
|
||||
void SetParent( ::Window *pParent );
|
||||
public:
|
||||
Dialog( Window *pOptParent, const char *pXMLPath, const char *pId, sal_uInt32 nId = 0 );
|
||||
Dialog( ::Window *pOptParent, const char *pXMLPath, const char *pId, sal_uInt32 nId = 0 );
|
||||
Dialog( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
|
||||
Dialog( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
|
||||
short Execute();
|
||||
void EndDialog( long nResult = 0 );
|
||||
void SetText( const String& rStr );
|
||||
void SetText( String const& rStr );
|
||||
};
|
||||
|
||||
class ProgressBarImpl;
|
||||
class TOOLKIT_DLLPUBLIC ProgressBar : public Control
|
||||
{
|
||||
DECL_GET_IMPL( ProgressBar );
|
||||
DECL_CONSTRUCTORS( ProgressBar, Control, WB_BORDER );
|
||||
public:
|
||||
void SetForegroundColor( css::util::Color color );
|
||||
void SetBackgroundColor( css::util::Color color );
|
||||
void SetValue( sal_Int32 i );
|
||||
void SetRange( sal_Int32 min, sal_Int32 max );
|
||||
sal_Int32 GetValue();
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
|
@ -371,9 +448,9 @@ class TOOLKIT_DLLPUBLIC Container
|
|||
{
|
||||
protected:
|
||||
css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
|
||||
Container( const rtl::OUString &rName, sal_Int32 nBorder );
|
||||
Container( rtl::OUString const& rName, sal_Int32 nBorder );
|
||||
public:
|
||||
Container( const Context *pCtx, const char *pId );
|
||||
Container( Context const* pCtx, char const* pId );
|
||||
|
||||
void Add( Window *pWindow );
|
||||
void Add( Container *pContainer );
|
||||
|
|
@ -385,6 +462,8 @@ public:
|
|||
// besides we would need to keep track of children, uh
|
||||
|
||||
void ShowAll( bool bVisible );
|
||||
void Show();
|
||||
void Hide();
|
||||
|
||||
css::uno::Reference< css::awt::XLayoutContainer > getImpl()
|
||||
{ return mxContainer; }
|
||||
|
|
@ -395,8 +474,7 @@ class TOOLKIT_DLLPUBLIC Table : public Container
|
|||
protected:
|
||||
Table( sal_Int32 nBorder, sal_Int32 nColumns );
|
||||
public:
|
||||
Table( const Context *pCtx, const char *pId )
|
||||
: Container( pCtx, pId ) {}
|
||||
Table( Context const* pCtx, char const* pId );
|
||||
void Add( Window *pWindow, bool bXExpand, bool bYExpand,
|
||||
sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
|
||||
void Add( Container *pContainer, bool bXExpand, bool bYExpand,
|
||||
|
|
@ -410,10 +488,9 @@ private:
|
|||
class TOOLKIT_DLLPUBLIC Box : public Container
|
||||
{
|
||||
protected:
|
||||
Box( const rtl::OUString &rName, sal_Int32 nBorder, bool bHomogeneous );
|
||||
Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous );
|
||||
public:
|
||||
Box( const Context *pCtx, const char *pId )
|
||||
: Container( pCtx, pId ) {}
|
||||
Box( Context const* pCtx, char const* pId );
|
||||
void Add( Window *pWindow, bool bExpand, bool bFill, sal_Int32 nPadding);
|
||||
void Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding);
|
||||
|
||||
|
|
@ -425,18 +502,16 @@ private:
|
|||
class TOOLKIT_DLLPUBLIC HBox : public Box
|
||||
{
|
||||
public:
|
||||
HBox( sal_Int32 nBorder, bool bHomogeneous )
|
||||
: Box( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hbox" ) ), nBorder, bHomogeneous ) {}
|
||||
HBox( Context const* pCtx, char const* pId );
|
||||
HBox( sal_Int32 nBorder, bool bHomogeneous );
|
||||
};
|
||||
class TOOLKIT_DLLPUBLIC VBox : public Box
|
||||
{
|
||||
public:
|
||||
VBox( sal_Int32 nBorder, bool bHomogeneous )
|
||||
: Box( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vbox" ) ), nBorder, bHomogeneous ) {}
|
||||
VBox( Context const* pCtx, char const* pId );
|
||||
VBox( sal_Int32 nBorder, bool bHomogeneous );
|
||||
};
|
||||
|
||||
} // end namespace layout
|
||||
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
#endif /* _LAYOUT_HXX */
|
||||
|
|
|
|||
Loading…
Reference in a new issue