summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/brdwin.hxx2
-rw-r--r--vcl/inc/printdlg.hxx2
-rw-r--r--vcl/inc/vcl/button.hxx6
-rw-r--r--vcl/inc/vcl/combobox.hxx2
-rw-r--r--vcl/inc/vcl/ctrl.hxx2
-rw-r--r--vcl/inc/vcl/dialog.hxx2
-rw-r--r--vcl/inc/vcl/edit.hxx2
-rw-r--r--vcl/inc/vcl/fixed.hxx6
-rw-r--r--vcl/inc/vcl/layout.hxx2
-rw-r--r--vcl/inc/vcl/lstbox.hxx2
-rw-r--r--vcl/inc/vcl/msgbox.hxx2
-rw-r--r--vcl/inc/vcl/scrbar.hxx2
-rw-r--r--vcl/inc/vcl/spinfld.hxx2
-rw-r--r--vcl/inc/vcl/tabctrl.hxx2
-rw-r--r--vcl/inc/vcl/tabpage.hxx2
-rw-r--r--vcl/inc/vcl/window.hxx9
16 files changed, 20 insertions, 27 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index d0e976430e39..55da2232bfbe 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -178,7 +178,7 @@ public:
Rectangle GetMenuRect() const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
};
// =======================================================================
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 3a0cbb7c7669..d57218ebd2bb 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -82,7 +82,7 @@ namespace vcl
ShowNupOrderWindow( Window* pParent );
virtual ~ShowNupOrderWindow();
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
virtual void Paint( const Rectangle& );
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 46be2854e301..47a44012a195 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -186,7 +186,7 @@ public:
TriState GetSavedValue() const { return meSaveValue; }
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
const Link& GetToggleHdl() const { return maToggleHdl; }
@@ -379,7 +379,7 @@ public:
static Image GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlags );
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
const Link& GetToggleHdl() const { return maToggleHdl; }
@@ -493,7 +493,7 @@ public:
static Image GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags );
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
const Link& GetToggleHdl() const { return maToggleHdl; }
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 72478c59a713..d0364105afb6 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -167,7 +167,7 @@ public:
const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
Size CalcMinimumSize() const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
Size CalcAdjustedSize( const Size& rPrefSize ) const;
using Edit::CalcSize;
Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx
index 682038602785..bd178f05657c 100644
--- a/vcl/inc/vcl/ctrl.hxx
+++ b/vcl/inc/vcl/ctrl.hxx
@@ -173,7 +173,7 @@ public:
void SetLayoutDataParent( const Control* pParent ) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
/** sets a reference device used for rendering control text
@seealso DrawControlText
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 6f5b0c0db934..7f16d07dd033 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -91,7 +91,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
virtual void Resize();
bool isLayoutEnabled() const;
void setInitialLayoutSize();
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 3957f69471de..10d3fe44a160 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -230,7 +230,7 @@ public:
virtual Size CalcMinimumSize() const;
virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
virtual Size CalcSize( sal_uInt16 nChars ) const;
virtual xub_StrLen GetMaxVisChars() const;
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index 22ed857ebd7e..7e1502595ddb 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -73,7 +73,7 @@ public:
static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff);
static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth);
Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
};
@@ -116,7 +116,7 @@ public:
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
};
// ---------------
@@ -188,7 +188,7 @@ public:
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
void SetImage( const Image& rImage );
const Image& GetImage() const { return maImage; }
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 7c71d9ccb928..073433f462ed 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -21,7 +21,7 @@ class VCL_DLLPUBLIC VclContainer : public Window
{
public:
VclContainer(Window *pParent, WinBits nStyle = WB_HIDE);
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
virtual void SetPosPixel(const Point& rAllocPos);
virtual void SetSizePixel(const Size& rAllocation);
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index cabc30bfb027..694f45c882b5 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -189,7 +189,7 @@ public:
Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown
Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
Size CalcAdjustedSize( const Size& rPrefSize ) const;
Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const;
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index cd9e86024280..8f0336dc045d 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -93,7 +93,7 @@ public:
void SetCheckBoxState( sal_Bool bCheck );
sal_Bool GetCheckBoxState() const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
};
// -----------
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 7c62d941d5fe..4a1a164121be 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -140,7 +140,7 @@ public:
void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; }
const Link& GetEndScrollHdl() const { return maEndScrollHdl; }
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
};
// ----------------
diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx
index 578aebb1ea88..4d38a2ea9dc0 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/vcl/inc/vcl/spinfld.hxx
@@ -102,7 +102,7 @@ public:
virtual Size CalcMinimumSize() const;
virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const;
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
virtual Size CalcSize( sal_uInt16 nChars ) const;
};
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 39cbad314c48..f2928d9cadd9 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -111,7 +111,7 @@ public:
virtual void ActivatePage();
virtual long DeactivatePage();
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
void SetTabPageSizePixel( const Size& rSize );
Size GetTabPageSizePixel() const;
diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index 1aa4b91a778b..769003d0357e 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -59,7 +59,7 @@ public:
virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
virtual void SetPosPixel(const Point& rNewPos);
virtual void SetSizePixel(const Size& rNewSize);
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
};
#endif // _SV_TABPAGE_HXX
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index f0ceb9a3e1b8..66c0cfa6e233 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -316,13 +316,6 @@ typedef sal_uInt16 StateChangedType;
#define DLGWINDOW_NEXT 1
#define DLGWINDOW_FIRST 2
-enum WindowSizeType
-{
- WINDOWSIZE_MINIMUM,
- WINDOWSIZE_PREFERRED,
- WINDOWSIZE_MAXIMUM
-};
-
// ----------
// - Window -
// ----------
@@ -1064,7 +1057,7 @@ public:
* Implement this in sub-classes to tell layout
* the preferred widget size.
*/
- virtual Size GetOptimalSize(WindowSizeType eType) const;
+ virtual Size GetOptimalSize() const;
/*
* Widgets call this to inform their owner container that the widget wants
generated by cgit (git 2.34.1) at 2025-03-01 03:03:08 +0000