projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly more efficient wxDataViewCtrl::StartEditor().
[wxWidgets.git]
/
include
/
wx
/
ribbon
/
panel.h
diff --git
a/include/wx/ribbon/panel.h
b/include/wx/ribbon/panel.h
index d36c82af28e79eeb693fb28bb2d6146e61a1ba5c..0c9f5f887fc9f34e2385967a0ed8ca0b679c055f 100644
(file)
--- a/
include/wx/ribbon/panel.h
+++ b/
include/wx/ribbon/panel.h
@@
-23,7
+23,7
@@
enum wxRibbonPanelOption
wxRIBBON_PANEL_NO_AUTO_MINIMISE = 1 << 0,
wxRIBBON_PANEL_EXT_BUTTON = 1 << 3,
wxRIBBON_PANEL_MINIMISE_BUTTON = 1 << 4,
wxRIBBON_PANEL_NO_AUTO_MINIMISE = 1 << 0,
wxRIBBON_PANEL_EXT_BUTTON = 1 << 3,
wxRIBBON_PANEL_MINIMISE_BUTTON = 1 << 4,
-
+
wxRIBBON_PANEL_DEFAULT_STYLE = 0,
};
wxRIBBON_PANEL_DEFAULT_STYLE = 0,
};
@@
-65,7
+65,6
@@
public:
virtual bool Realize();
virtual bool Layout();
virtual wxSize GetMinSize() const;
virtual bool Realize();
virtual bool Layout();
virtual wxSize GetMinSize() const;
- virtual wxSize DoGetBestSize() const;
virtual bool IsSizingContinuous() const;
virtual bool IsSizingContinuous() const;
@@
-76,6
+75,9
@@
public:
wxRibbonPanel* GetExpandedPanel();
protected:
wxRibbonPanel* GetExpandedPanel();
protected:
+ virtual wxSize DoGetBestSize() const;
+ virtual wxSize GetPanelSizerBestSize() const;
+ wxSize GetPanelSizerMinSize() const;
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
wxSize GetMinNotMinimisedSize() const;
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
wxSize GetMinNotMinimisedSize() const;