make access for virtuals match base
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 ;
|
||||
|
@@ -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)
|
||||
|
@@ -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)
|
||||
};
|
||||
|
@@ -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()
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user