From cff9681b857589f9328541762da1111fc4958689 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 3 Dec 2009 17:20:15 +0000 Subject: [PATCH] make access for virtuals match base git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/listctrl.h | 3 ++- include/wx/osx/carbon/private.h | 8 +++++--- include/wx/osx/cursor.h | 7 ++++--- include/wx/osx/frame.h | 8 +++----- include/wx/osx/statusbr.h | 9 ++++----- include/wx/ribbon/bar.h | 2 +- include/wx/ribbon/buttonbar.h | 2 +- include/wx/ribbon/page.h | 2 +- include/wx/ribbon/panel.h | 2 +- include/wx/ribbon/toolbar.h | 2 +- include/wx/textctrl.h | 1 - include/wx/window.h | 12 ++++++------ 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index e33dfcf8d1..1d02db3389 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -243,11 +243,12 @@ protected: virtual wxBorder GetDefaultBorder() const; + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size); + private: void CreateOrDestroyHeaderWindowAsNeeded(); void OnScroll( wxScrollWinEvent& event ); void OnSize( wxSizeEvent &event ); - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size); // we need to return a special WM_GETDLGCODE value to process just the // arrows but let the other navigation characters through diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h index a96cde255a..e63edd4891 100644 --- a/include/wx/osx/carbon/private.h +++ b/include/wx/osx/carbon/private.h @@ -901,14 +901,16 @@ public: virtual void UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ); virtual void UpdateLineToEnd( unsigned int n) ; + // pointing back + + wxMacDataBrowserColumn* GetColumnFromProperty( DataBrowserPropertyID ); + +protected: virtual void ItemNotification( DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData); - // pointing back - - wxMacDataBrowserColumn* GetColumnFromProperty( DataBrowserPropertyID ); private: wxArrayMacDataBrowserColumns m_columns; int m_nextColumnId ; diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h index e252623f33..66516c4113 100644 --- a/include/wx/osx/cursor.h +++ b/include/wx/osx/cursor.h @@ -36,12 +36,13 @@ public: void SetHCURSOR(WXHCURSOR cursor); WXHCURSOR GetHCURSOR() const; -private: - void InitFromStock(wxStockCursor); - +protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; +private: + void InitFromStock(wxStockCursor); + void CreateFromImage(const wxImage & image) ; DECLARE_DYNAMIC_CLASS(wxCursor) diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index 87cbdcca36..42c9393748 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -88,6 +88,9 @@ public: void PositionBars(); + // osx specific event handling common for all osx-ports + virtual void HandleResized( double timestampsec ); + protected: // common part of all ctors void Init(); @@ -108,16 +111,11 @@ protected: virtual void AttachMenuBar(wxMenuBar *menubar); #endif - // osx specific event handling common for all osx-ports - virtual void HandleResized( double timestampsec ); - -protected: // the last focused child: we restore focus to it on activation wxWindow *m_winLastFocused; virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; -private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) }; diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h index 184bb7a4b2..b1c73a7dbb 100644 --- a/include/wx/osx/statusbr.h +++ b/include/wx/osx/statusbr.h @@ -15,8 +15,7 @@ class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric { - DECLARE_DYNAMIC_CLASS(wxStatusBarMac) - +public: wxStatusBarMac(); wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY, long style = wxSTB_DEFAULT_STYLE, @@ -28,16 +27,16 @@ class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric long style = wxSTB_DEFAULT_STYLE, const wxString& name = wxStatusBarNameStr); - virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight); - virtual void DrawField(wxDC& dc, int i, int textHeight); - // Implementation virtual void MacHiliteChanged(); void OnPaint(wxPaintEvent& event); protected: + virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight); + virtual void DrawField(wxDC& dc, int i, int textHeight); virtual void DoUpdateStatusText(int number = 0); + DECLARE_DYNAMIC_CLASS(wxStatusBarMac) DECLARE_EVENT_TABLE() }; diff --git a/include/wx/ribbon/bar.h b/include/wx/ribbon/bar.h index 39752c7c58..4f62dbadd9 100644 --- a/include/wx/ribbon/bar.h +++ b/include/wx/ribbon/bar.h @@ -115,7 +115,6 @@ public: wxRibbonPage* GetPage(int n); bool DismissExpandedPanel(); - virtual wxSize DoGetBestSize() const; virtual bool HasMultiplePages() const { return true; } void SetWindowStyleFlag(long style); @@ -125,6 +124,7 @@ public: protected: friend class wxRibbonPage; + virtual wxSize DoGetBestSize() const; wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL); diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h index b1642de78b..9bc070a08c 100644 --- a/include/wx/ribbon/buttonbar.h +++ b/include/wx/ribbon/buttonbar.h @@ -87,9 +87,9 @@ public: virtual bool IsSizingContinuous() const; virtual wxSize GetMinSize() const; - virtual wxSize DoGetBestSize() const; protected: friend class wxRibbonButtonBarEvent; + virtual wxSize DoGetBestSize() const; wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); diff --git a/include/wx/ribbon/page.h b/include/wx/ribbon/page.h index 80d8e6f1cf..2be1e69a5f 100644 --- a/include/wx/ribbon/page.h +++ b/include/wx/ribbon/page.h @@ -46,7 +46,6 @@ public: wxBitmap& GetIcon() {return m_icon;} virtual wxSize GetMinSize() const; - virtual wxSize DoGetBestSize() const; void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height); void AdjustRectToIncludeScrollButtons(wxRect* rect) const; @@ -63,6 +62,7 @@ public: virtual void RemoveChild(wxWindowBase *child); protected: + virtual wxSize DoGetBestSize() const; virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h index d36c82af28..1b2e20eb74 100644 --- a/include/wx/ribbon/panel.h +++ b/include/wx/ribbon/panel.h @@ -65,7 +65,6 @@ public: virtual bool Realize(); virtual bool Layout(); virtual wxSize GetMinSize() const; - virtual wxSize DoGetBestSize() const; virtual bool IsSizingContinuous() const; @@ -76,6 +75,7 @@ public: wxRibbonPanel* GetExpandedPanel(); protected: + virtual wxSize DoGetBestSize() const; wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } wxSize GetMinNotMinimisedSize() const; diff --git a/include/wx/ribbon/toolbar.h b/include/wx/ribbon/toolbar.h index ae11bc7dc7..206d2691ad 100644 --- a/include/wx/ribbon/toolbar.h +++ b/include/wx/ribbon/toolbar.h @@ -88,10 +88,10 @@ public: virtual void SetRows(int nMin, int nMax = -1); virtual bool IsSizingContinuous() const; - virtual wxSize DoGetBestSize() const; protected: friend class wxRibbonToolBarEvent; + virtual wxSize DoGetBestSize() const; wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index a2e06b2cbd..0a1695db17 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -714,7 +714,6 @@ protected: virtual bool DoLoadFile(const wxString& file, int fileType); virtual bool DoSaveFile(const wxString& file, int fileType); -private: // implement the wxTextEntry pure virtual method virtual wxWindow *GetEditableWindow() { return this; } diff --git a/include/wx/window.h b/include/wx/window.h index 33a7ae01b2..83660b0cf8 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1411,6 +1411,12 @@ public: // used only by Windows virtual bool CanApplyThemeBorder() const { return true; } + // returns the main window of composite control; this is the window + // that FindFocus returns if the focus is in one of composite control's + // windows + virtual wxWindow *GetMainWindowOfCompositeControl() + { return (wxWindow*)this; } + protected: // helper for the derived class Create() methods: the first overload, with // validator parameter, should be used for child windows while the second @@ -1458,12 +1464,6 @@ protected: // to true void SendDestroyEvent(); - // returns the main window of composite control; this is the window - // that FindFocus returns if the focus is in one of composite control's - // windows - virtual wxWindow *GetMainWindowOfCompositeControl() - { return (wxWindow*)this; } - // this method should be implemented to use operating system specific code // to really enable/disable the widget, it will only be called when we // really need to enable/disable window and so no additional checks on the