use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
@@ -409,80 +409,80 @@ public:
|
||||
wxRibbonMSWArtProvider(bool set_colour_scheme = true);
|
||||
virtual ~wxRibbonMSWArtProvider();
|
||||
|
||||
wxRibbonArtProvider* Clone() const;
|
||||
void SetFlags(long flags);
|
||||
long GetFlags() const;
|
||||
wxRibbonArtProvider* Clone() const wxOVERRIDE;
|
||||
void SetFlags(long flags) wxOVERRIDE;
|
||||
long GetFlags() const wxOVERRIDE;
|
||||
|
||||
int GetMetric(int id) const;
|
||||
void SetMetric(int id, int new_val);
|
||||
void SetFont(int id, const wxFont& font);
|
||||
wxFont GetFont(int id) const;
|
||||
wxColour GetColour(int id) const;
|
||||
void SetColour(int id, const wxColor& colour);
|
||||
int GetMetric(int id) const wxOVERRIDE;
|
||||
void SetMetric(int id, int new_val) wxOVERRIDE;
|
||||
void SetFont(int id, const wxFont& font) wxOVERRIDE;
|
||||
wxFont GetFont(int id) const wxOVERRIDE;
|
||||
wxColour GetColour(int id) const wxOVERRIDE;
|
||||
void SetColour(int id, const wxColor& colour) wxOVERRIDE;
|
||||
void GetColourScheme(wxColour* primary,
|
||||
wxColour* secondary,
|
||||
wxColour* tertiary) const;
|
||||
wxColour* tertiary) const wxOVERRIDE;
|
||||
void SetColourScheme(const wxColour& primary,
|
||||
const wxColour& secondary,
|
||||
const wxColour& tertiary);
|
||||
const wxColour& tertiary) wxOVERRIDE;
|
||||
|
||||
int GetTabCtrlHeight(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRibbonPageTabInfoArray& pages);
|
||||
const wxRibbonPageTabInfoArray& pages) wxOVERRIDE;
|
||||
|
||||
void DrawTabCtrlBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawTab(wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRibbonPageTabInfo& tab);
|
||||
const wxRibbonPageTabInfo& tab) wxOVERRIDE;
|
||||
|
||||
void DrawTabSeparator(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect,
|
||||
double visibility);
|
||||
double visibility) wxOVERRIDE;
|
||||
|
||||
void DrawPageBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawScrollButton(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect,
|
||||
long style);
|
||||
long style) wxOVERRIDE;
|
||||
|
||||
void DrawPanelBackground(
|
||||
wxDC& dc,
|
||||
wxRibbonPanel* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawGalleryBackground(
|
||||
wxDC& dc,
|
||||
wxRibbonGallery* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawGalleryItemBackground(
|
||||
wxDC& dc,
|
||||
wxRibbonGallery* wnd,
|
||||
const wxRect& rect,
|
||||
wxRibbonGalleryItem* item);
|
||||
wxRibbonGalleryItem* item) wxOVERRIDE;
|
||||
|
||||
void DrawMinimisedPanel(
|
||||
wxDC& dc,
|
||||
wxRibbonPanel* wnd,
|
||||
const wxRect& rect,
|
||||
wxBitmap& bitmap);
|
||||
wxBitmap& bitmap) wxOVERRIDE;
|
||||
|
||||
void DrawButtonBarBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawButtonBarButton(
|
||||
wxDC& dc,
|
||||
@@ -492,17 +492,17 @@ public:
|
||||
long state,
|
||||
const wxString& label,
|
||||
const wxBitmap& bitmap_large,
|
||||
const wxBitmap& bitmap_small);
|
||||
const wxBitmap& bitmap_small) wxOVERRIDE;
|
||||
|
||||
void DrawToolBarBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawToolGroupBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawTool(
|
||||
wxDC& dc,
|
||||
@@ -510,17 +510,17 @@ public:
|
||||
const wxRect& rect,
|
||||
const wxBitmap& bitmap,
|
||||
wxRibbonButtonKind kind,
|
||||
long state);
|
||||
long state) wxOVERRIDE;
|
||||
|
||||
void DrawToggleButton(
|
||||
wxDC& dc,
|
||||
wxRibbonBar* wnd,
|
||||
const wxRect& rect,
|
||||
wxRibbonDisplayMode mode);
|
||||
wxRibbonDisplayMode mode) wxOVERRIDE;
|
||||
|
||||
void DrawHelpButton(wxDC& dc,
|
||||
wxRibbonBar* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void GetBarTabWidth(
|
||||
wxDC& dc,
|
||||
@@ -530,34 +530,34 @@ public:
|
||||
int* ideal,
|
||||
int* small_begin_need_separator,
|
||||
int* small_must_have_separator,
|
||||
int* minimum);
|
||||
int* minimum) wxOVERRIDE;
|
||||
|
||||
wxSize GetScrollButtonMinimumSize(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
long style);
|
||||
long style) wxOVERRIDE;
|
||||
|
||||
wxSize GetPanelSize(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxSize client_size,
|
||||
wxPoint* client_offset);
|
||||
wxPoint* client_offset) wxOVERRIDE;
|
||||
|
||||
wxSize GetPanelClientSize(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxSize size,
|
||||
wxPoint* client_offset);
|
||||
wxPoint* client_offset) wxOVERRIDE;
|
||||
|
||||
wxRect GetPanelExtButtonArea(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxRect rect);
|
||||
wxRect rect) wxOVERRIDE;
|
||||
|
||||
wxSize GetGallerySize(
|
||||
wxDC& dc,
|
||||
const wxRibbonGallery* wnd,
|
||||
wxSize client_size);
|
||||
wxSize client_size) wxOVERRIDE;
|
||||
|
||||
wxSize GetGalleryClientSize(
|
||||
wxDC& dc,
|
||||
@@ -566,13 +566,13 @@ public:
|
||||
wxPoint* client_offset,
|
||||
wxRect* scroll_up_button,
|
||||
wxRect* scroll_down_button,
|
||||
wxRect* extension_button);
|
||||
wxRect* extension_button) wxOVERRIDE;
|
||||
|
||||
wxRect GetPageBackgroundRedrawArea(
|
||||
wxDC& dc,
|
||||
const wxRibbonPage* wnd,
|
||||
wxSize page_old_size,
|
||||
wxSize page_new_size);
|
||||
wxSize page_new_size) wxOVERRIDE;
|
||||
|
||||
bool GetButtonBarButtonSize(
|
||||
wxDC& dc,
|
||||
@@ -584,13 +584,13 @@ public:
|
||||
wxSize bitmap_size_small,
|
||||
wxSize* button_size,
|
||||
wxRect* normal_region,
|
||||
wxRect* dropdown_region);
|
||||
wxRect* dropdown_region) wxOVERRIDE;
|
||||
|
||||
wxSize GetMinimisedPanelMinimumSize(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxSize* desired_bitmap_size,
|
||||
wxDirection* expanded_panel_direction);
|
||||
wxDirection* expanded_panel_direction) wxOVERRIDE;
|
||||
|
||||
wxSize GetToolSize(
|
||||
wxDC& dc,
|
||||
@@ -599,11 +599,11 @@ public:
|
||||
wxRibbonButtonKind kind,
|
||||
bool is_first,
|
||||
bool is_last,
|
||||
wxRect* dropdown_region);
|
||||
wxRect* dropdown_region) wxOVERRIDE;
|
||||
|
||||
wxRect GetBarToggleButtonArea(const wxRect& rect);
|
||||
wxRect GetBarToggleButtonArea(const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
wxRect GetRibbonHelpButtonArea(const wxRect& rect);
|
||||
wxRect GetRibbonHelpButtonArea(const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void ReallyDrawTabSeparator(wxWindow* wnd, const wxRect& rect, double visibility);
|
||||
@@ -768,52 +768,52 @@ public:
|
||||
wxRibbonAUIArtProvider();
|
||||
virtual ~wxRibbonAUIArtProvider();
|
||||
|
||||
wxRibbonArtProvider* Clone() const;
|
||||
wxRibbonArtProvider* Clone() const wxOVERRIDE;
|
||||
|
||||
wxColour GetColour(int id) const;
|
||||
void SetColour(int id, const wxColor& colour);
|
||||
wxColour GetColour(int id) const wxOVERRIDE;
|
||||
void SetColour(int id, const wxColor& colour) wxOVERRIDE;
|
||||
void SetColourScheme(const wxColour& primary,
|
||||
const wxColour& secondary,
|
||||
const wxColour& tertiary);
|
||||
void SetFont(int id, const wxFont& font);
|
||||
const wxColour& tertiary) wxOVERRIDE;
|
||||
void SetFont(int id, const wxFont& font) wxOVERRIDE;
|
||||
|
||||
wxSize GetScrollButtonMinimumSize(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
long style);
|
||||
long style) wxOVERRIDE;
|
||||
|
||||
void DrawScrollButton(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect,
|
||||
long style);
|
||||
long style) wxOVERRIDE;
|
||||
|
||||
wxSize GetPanelSize(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxSize client_size,
|
||||
wxPoint* client_offset);
|
||||
wxPoint* client_offset) wxOVERRIDE;
|
||||
|
||||
wxSize GetPanelClientSize(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxSize size,
|
||||
wxPoint* client_offset);
|
||||
wxPoint* client_offset) wxOVERRIDE;
|
||||
|
||||
wxRect GetPanelExtButtonArea(
|
||||
wxDC& dc,
|
||||
const wxRibbonPanel* wnd,
|
||||
wxRect rect);
|
||||
wxRect rect) wxOVERRIDE;
|
||||
|
||||
void DrawTabCtrlBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
int GetTabCtrlHeight(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRibbonPageTabInfoArray& pages);
|
||||
const wxRibbonPageTabInfoArray& pages) wxOVERRIDE;
|
||||
|
||||
void GetBarTabWidth(
|
||||
wxDC& dc,
|
||||
@@ -823,49 +823,49 @@ public:
|
||||
int* ideal,
|
||||
int* small_begin_need_separator,
|
||||
int* small_must_have_separator,
|
||||
int* minimum);
|
||||
int* minimum) wxOVERRIDE;
|
||||
|
||||
void DrawTab(wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRibbonPageTabInfo& tab);
|
||||
const wxRibbonPageTabInfo& tab) wxOVERRIDE;
|
||||
|
||||
void DrawTabSeparator(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect,
|
||||
double visibility);
|
||||
double visibility) wxOVERRIDE;
|
||||
|
||||
void DrawPageBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawPanelBackground(
|
||||
wxDC& dc,
|
||||
wxRibbonPanel* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawMinimisedPanel(
|
||||
wxDC& dc,
|
||||
wxRibbonPanel* wnd,
|
||||
const wxRect& rect,
|
||||
wxBitmap& bitmap);
|
||||
wxBitmap& bitmap) wxOVERRIDE;
|
||||
|
||||
void DrawGalleryBackground(
|
||||
wxDC& dc,
|
||||
wxRibbonGallery* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawGalleryItemBackground(
|
||||
wxDC& dc,
|
||||
wxRibbonGallery* wnd,
|
||||
const wxRect& rect,
|
||||
wxRibbonGalleryItem* item);
|
||||
wxRibbonGalleryItem* item) wxOVERRIDE;
|
||||
|
||||
void DrawButtonBarBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawButtonBarButton(
|
||||
wxDC& dc,
|
||||
@@ -875,17 +875,17 @@ public:
|
||||
long state,
|
||||
const wxString& label,
|
||||
const wxBitmap& bitmap_large,
|
||||
const wxBitmap& bitmap_small);
|
||||
const wxBitmap& bitmap_small) wxOVERRIDE;
|
||||
|
||||
void DrawToolBarBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawToolGroupBackground(
|
||||
wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
|
||||
void DrawTool(
|
||||
wxDC& dc,
|
||||
@@ -893,13 +893,13 @@ public:
|
||||
const wxRect& rect,
|
||||
const wxBitmap& bitmap,
|
||||
wxRibbonButtonKind kind,
|
||||
long state);
|
||||
long state) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void DrawPartialPanelBackground(wxDC& dc, wxWindow* wnd,
|
||||
const wxRect& rect);
|
||||
void DrawGalleryButton(wxDC& dc, wxRect rect,
|
||||
wxRibbonGalleryButtonState state, wxBitmap* bitmaps);
|
||||
wxRibbonGalleryButtonState state, wxBitmap* bitmaps) wxOVERRIDE;
|
||||
|
||||
wxColour m_tab_ctrl_background_colour;
|
||||
wxColour m_tab_ctrl_background_gradient_colour;
|
||||
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
m_page = c.m_page;
|
||||
}
|
||||
#endif
|
||||
wxEvent *Clone() const { return new wxRibbonBarEvent(*this); }
|
||||
wxEvent *Clone() const wxOVERRIDE { return new wxRibbonBarEvent(*this); }
|
||||
|
||||
wxRibbonPage* GetPage() {return m_page;}
|
||||
void SetPage(wxRibbonPage* page) {m_page = page;}
|
||||
@@ -119,7 +119,7 @@ public:
|
||||
|
||||
void SetTabCtrlMargins(int left, int right);
|
||||
|
||||
void SetArtProvider(wxRibbonArtProvider* art);
|
||||
void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE;
|
||||
|
||||
bool SetActivePage(size_t page);
|
||||
bool SetActivePage(wxRibbonPage* page);
|
||||
@@ -144,11 +144,11 @@ public:
|
||||
void HidePanels() { ShowPanels(false); }
|
||||
bool ArePanelsShown() const { return m_arePanelsShown; }
|
||||
|
||||
virtual bool HasMultiplePages() const { return true; }
|
||||
virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
|
||||
|
||||
void SetWindowStyleFlag(long style);
|
||||
long GetWindowStyleFlag() const;
|
||||
virtual bool Realize();
|
||||
void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
long GetWindowStyleFlag() const wxOVERRIDE;
|
||||
virtual bool Realize() wxOVERRIDE;
|
||||
|
||||
// Implementation only.
|
||||
bool IsToggleButtonHovered() const { return m_toggle_button_hovered; }
|
||||
@@ -159,8 +159,8 @@ public:
|
||||
protected:
|
||||
friend class wxRibbonPage;
|
||||
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL);
|
||||
void HitTestRibbonButton(const wxRect& rect, const wxPoint& position, bool &hover_flag);
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ public:
|
||||
virtual int GetItemId(wxRibbonButtonBarButtonBase *button) const;
|
||||
|
||||
|
||||
virtual bool Realize();
|
||||
virtual bool Realize() wxOVERRIDE;
|
||||
virtual void ClearButtons();
|
||||
virtual bool DeleteButton(int button_id);
|
||||
virtual void EnableButton(int button_id, bool enable = true);
|
||||
@@ -142,18 +142,18 @@ public:
|
||||
virtual wxRibbonButtonBarButtonBase *GetActiveItem() const;
|
||||
virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const;
|
||||
|
||||
virtual void SetArtProvider(wxRibbonArtProvider* art);
|
||||
virtual bool IsSizingContinuous() const;
|
||||
virtual void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE;
|
||||
virtual bool IsSizingContinuous() const wxOVERRIDE;
|
||||
|
||||
virtual wxSize GetMinSize() const;
|
||||
virtual wxSize GetMinSize() const wxOVERRIDE;
|
||||
|
||||
void SetShowToolTipsForDisabled(bool show);
|
||||
bool GetShowToolTipsForDisabled() const;
|
||||
|
||||
protected:
|
||||
friend class wxRibbonButtonBarEvent;
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
|
||||
void OnEraseBackground(wxEraseEvent& evt);
|
||||
void OnPaint(wxPaintEvent& evt);
|
||||
@@ -165,9 +165,9 @@ protected:
|
||||
void OnMouseUp(wxMouseEvent& evt);
|
||||
|
||||
virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
virtual wxSize DoGetNextLargerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
|
||||
void CommonInit(long style);
|
||||
void MakeLayouts();
|
||||
@@ -176,7 +176,7 @@ protected:
|
||||
static wxBitmap MakeDisabledBitmap(const wxBitmap& original);
|
||||
void FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button,
|
||||
wxRibbonButtonBarButtonState size, wxDC& dc);
|
||||
virtual void UpdateWindowUI(long flags);
|
||||
virtual void UpdateWindowUI(long flags) wxOVERRIDE;
|
||||
|
||||
wxArrayRibbonButtonBarLayout m_layouts;
|
||||
wxArrayRibbonButtonBarButtonBase m_buttons;
|
||||
@@ -215,7 +215,7 @@ public:
|
||||
m_button = e.m_button;
|
||||
}
|
||||
#endif
|
||||
wxEvent *Clone() const { return new wxRibbonButtonBarEvent(*this); }
|
||||
wxEvent *Clone() const wxOVERRIDE { return new wxRibbonButtonBarEvent(*this); }
|
||||
|
||||
wxRibbonButtonBar* GetBar() {return m_bar;}
|
||||
wxRibbonButtonBarButtonBase *GetButton() { return m_button; }
|
||||
|
||||
@@ -63,16 +63,16 @@ public:
|
||||
wxRibbonGalleryButtonState GetExtensionButtonState() const;
|
||||
|
||||
bool IsHovered() const;
|
||||
virtual bool IsSizingContinuous() const;
|
||||
virtual bool Realize();
|
||||
virtual bool Layout();
|
||||
virtual bool IsSizingContinuous() const wxOVERRIDE;
|
||||
virtual bool Realize() wxOVERRIDE;
|
||||
virtual bool Layout() wxOVERRIDE;
|
||||
|
||||
virtual bool ScrollLines(int lines);
|
||||
virtual bool ScrollLines(int lines) wxOVERRIDE;
|
||||
bool ScrollPixels(int pixels);
|
||||
void EnsureVisible(const wxRibbonGalleryItem* item);
|
||||
|
||||
protected:
|
||||
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
void CommonInit(long style);
|
||||
void CalculateMinSize();
|
||||
bool TestButtonHover(const wxRect& rect, wxPoint pos,
|
||||
@@ -89,11 +89,11 @@ protected:
|
||||
void OnSize(wxSizeEvent& evt);
|
||||
int GetScrollLineSize() const;
|
||||
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
virtual wxSize DoGetNextLargerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
|
||||
wxArrayRibbonGalleryItem m_items;
|
||||
wxRibbonGalleryItem* m_selected_item;
|
||||
@@ -140,7 +140,7 @@ public:
|
||||
m_item = e.m_item;
|
||||
}
|
||||
#endif
|
||||
wxEvent *Clone() const { return new wxRibbonGalleryEvent(*this); }
|
||||
wxEvent *Clone() const wxOVERRIDE { return new wxRibbonGalleryEvent(*this); }
|
||||
|
||||
wxRibbonGallery* GetGallery() {return m_gallery;}
|
||||
wxRibbonGalleryItem* GetGalleryItem() {return m_item;}
|
||||
|
||||
@@ -41,33 +41,33 @@ public:
|
||||
const wxBitmap& icon = wxNullBitmap,
|
||||
long style = 0);
|
||||
|
||||
void SetArtProvider(wxRibbonArtProvider* art);
|
||||
void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE;
|
||||
|
||||
wxBitmap& GetIcon() {return m_icon;}
|
||||
virtual wxSize GetMinSize() const;
|
||||
virtual wxSize GetMinSize() const wxOVERRIDE;
|
||||
void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height);
|
||||
void AdjustRectToIncludeScrollButtons(wxRect* rect) const;
|
||||
|
||||
bool DismissExpandedPanel();
|
||||
|
||||
virtual bool Realize();
|
||||
virtual bool Show(bool show = true);
|
||||
virtual bool Layout();
|
||||
virtual bool ScrollLines(int lines);
|
||||
virtual bool Realize() wxOVERRIDE;
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual bool Layout() wxOVERRIDE;
|
||||
virtual bool ScrollLines(int lines) wxOVERRIDE;
|
||||
bool ScrollPixels(int pixels);
|
||||
bool ScrollSections(int sections);
|
||||
|
||||
wxOrientation GetMajorAxis() const;
|
||||
|
||||
virtual void RemoveChild(wxWindowBase *child);
|
||||
virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE;
|
||||
|
||||
void HideIfExpanded();
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
|
||||
void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
|
||||
void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
bool DoActualLayout();
|
||||
void OnEraseBackground(wxEraseEvent& evt);
|
||||
void OnPaint(wxPaintEvent& evt);
|
||||
|
||||
@@ -62,16 +62,16 @@ public:
|
||||
bool ShowExpanded();
|
||||
bool HideExpanded();
|
||||
|
||||
void SetArtProvider(wxRibbonArtProvider* art);
|
||||
void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE;
|
||||
|
||||
virtual bool Realize();
|
||||
virtual bool Layout();
|
||||
virtual wxSize GetMinSize() const;
|
||||
virtual bool Realize() wxOVERRIDE;
|
||||
virtual bool Layout() wxOVERRIDE;
|
||||
virtual wxSize GetMinSize() const wxOVERRIDE;
|
||||
|
||||
virtual bool IsSizingContinuous() const;
|
||||
virtual bool IsSizingContinuous() const wxOVERRIDE;
|
||||
|
||||
virtual void AddChild(wxWindowBase *child);
|
||||
virtual void RemoveChild(wxWindowBase *child);
|
||||
virtual void AddChild(wxWindowBase *child) wxOVERRIDE;
|
||||
virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE;
|
||||
|
||||
virtual bool HasExtButton() const;
|
||||
|
||||
@@ -79,25 +79,25 @@ public:
|
||||
wxRibbonPanel* GetExpandedPanel();
|
||||
|
||||
// Finds the best width and height given the parent's width and height
|
||||
virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const;
|
||||
virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const wxOVERRIDE;
|
||||
|
||||
long GetFlags() { return m_flags; }
|
||||
|
||||
void HideIfExpanded();
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxSize GetPanelSizerBestSize() const;
|
||||
wxSize GetPanelSizerMinSize() const;
|
||||
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
wxSize GetMinNotMinimisedSize() const;
|
||||
|
||||
virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
virtual wxSize DoGetNextLargerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
|
||||
void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
|
||||
void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
void OnSize(wxSizeEvent& evt);
|
||||
void OnEraseBackground(wxEraseEvent& evt);
|
||||
void OnPaint(wxPaintEvent& evt);
|
||||
@@ -112,7 +112,7 @@ protected:
|
||||
|
||||
void TestPositionForHover(const wxPoint& pos);
|
||||
bool ShouldSendEventToDummy(wxEvent& evt);
|
||||
virtual bool TryAfter(wxEvent& evt);
|
||||
virtual bool TryAfter(wxEvent& evt) wxOVERRIDE;
|
||||
|
||||
void CommonInit(const wxString& label, const wxBitmap& icon, long style);
|
||||
static wxRect GetExpandedPosition(wxRect panel,
|
||||
@@ -156,7 +156,7 @@ public:
|
||||
m_panel = e.m_panel;
|
||||
}
|
||||
#endif
|
||||
wxEvent *Clone() const { return new wxRibbonPanelEvent(*this); }
|
||||
wxEvent *Clone() const wxOVERRIDE { return new wxRibbonPanelEvent(*this); }
|
||||
|
||||
wxRibbonPanel* GetPanel() {return m_panel;}
|
||||
void SetPanel(wxRibbonPanel* panel) {m_panel = panel;}
|
||||
|
||||
@@ -141,7 +141,7 @@ public:
|
||||
virtual int GetToolPos(int tool_id)const;
|
||||
virtual bool GetToolState(int tool_id)const;
|
||||
|
||||
virtual bool Realize();
|
||||
virtual bool Realize() wxOVERRIDE;
|
||||
virtual void SetRows(int nMin, int nMax = -1);
|
||||
|
||||
virtual void SetToolClientData(int tool_id, wxObject* clientData);
|
||||
@@ -149,18 +149,18 @@ public:
|
||||
virtual void SetToolHelpString(int tool_id, const wxString& helpString);
|
||||
virtual void SetToolNormalBitmap(int tool_id, const wxBitmap &bitmap);
|
||||
|
||||
virtual bool IsSizingContinuous() const;
|
||||
virtual bool IsSizingContinuous() const wxOVERRIDE;
|
||||
|
||||
virtual void EnableTool(int tool_id, bool enable = true);
|
||||
virtual void ToggleTool(int tool_id, bool checked);
|
||||
|
||||
// Finds the best width and height given the parent's width and height
|
||||
virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const;
|
||||
virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
friend class wxRibbonToolBarEvent;
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
|
||||
void OnEraseBackground(wxEraseEvent& evt);
|
||||
void OnMouseDown(wxMouseEvent& evt);
|
||||
@@ -172,14 +172,14 @@ protected:
|
||||
void OnSize(wxSizeEvent& evt);
|
||||
|
||||
virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
virtual wxSize DoGetNextLargerSize(wxOrientation direction,
|
||||
wxSize relative_to) const;
|
||||
wxSize relative_to) const wxOVERRIDE;
|
||||
|
||||
void CommonInit(long style);
|
||||
void AppendGroup();
|
||||
wxRibbonToolBarToolGroup* InsertGroup(size_t pos);
|
||||
virtual void UpdateWindowUI(long flags);
|
||||
virtual void UpdateWindowUI(long flags) wxOVERRIDE;
|
||||
|
||||
static wxBitmap MakeDisabledBitmap(const wxBitmap& original);
|
||||
|
||||
@@ -213,7 +213,7 @@ public:
|
||||
m_bar = e.m_bar;
|
||||
}
|
||||
#endif
|
||||
wxEvent *Clone() const { return new wxRibbonToolBarEvent(*this); }
|
||||
wxEvent *Clone() const wxOVERRIDE { return new wxRibbonToolBarEvent(*this); }
|
||||
|
||||
wxRibbonToolBar* GetBar() {return m_bar;}
|
||||
void SetBar(wxRibbonToolBar* bar) {m_bar = bar;}
|
||||
|
||||
Reference in New Issue
Block a user