Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make access specifiers for the virtual functions match their access in the base class (patch 1400131)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-08 21:47:09 +00:00
parent e4ccedf7b2
commit 6f02a879ed
133 changed files with 611 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/mac/carbon/checkbox.h
View File

@@ -34,12 +34,13 @@ public:
virtual void SetValue(bool);
virtual bool GetValue() const;
void DoSet3StateValue(wxCheckBoxState val);
virtual wxCheckBoxState DoGet3StateValue() const;
virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
virtual void Command(wxCommandEvent& event);
protected:
void DoSet3StateValue(wxCheckBoxState val);
virtual wxCheckBoxState DoGet3StateValue() const;
DECLARE_DYNAMIC_CLASS(wxCheckBox)
};

7
include/wx/mac/carbon/choice.h
View File

@@ -69,9 +69,6 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
// implement base class pure virtuals
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
virtual void Delete(int n);
virtual void Clear();
@@ -87,14 +84,14 @@ public:
protected:
virtual wxSize DoGetBestSize() const ;
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
public: // for wxComboBox only
virtual void DoSetItemClientData( int n, void* clientData );
virtual void* DoGetItemClientData( int n ) const;
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetItemClientObject( int n ) const;
protected:
// free all memory we have (used by Clear() and dtor)
// prevent collision with some BSD definitions of macro Free()
void FreeData();

7
include/wx/mac/carbon/combobox.h
View File

@@ -29,9 +29,6 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
public:
inline wxComboBox() {}
virtual ~wxComboBox();
// override the base class virtuals involved in geometry calculations
virtual wxSize DoGetBestSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height);
// forward these functions to all subcontrols
virtual bool Enable(bool enable = true);
@@ -129,6 +126,10 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
protected:
// override the base class virtuals involved in geometry calculations
virtual wxSize DoGetBestSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual int DoAppend(const wxString& item) ;
virtual int DoInsert(const wxString& item, int pos) ;

43
include/wx/mac/carbon/dataobj2.h
View File

@@ -35,6 +35,19 @@ public:
virtual size_t GetDataSize() const ;
virtual bool GetDataHere(void *buf) const ;
virtual bool SetData(size_t len, const void *buf);
// Must provide overloads to avoid hiding them (and warnings about it)
virtual size_t GetDataSize(const wxDataFormat&) const
{
return GetDataSize();
}
virtual bool GetDataHere(const wxDataFormat&, void *buf) const
{
return GetDataHere(buf);
}
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
{
return SetData(len, buf);
}
protected :
void Init() ;
@@ -42,14 +55,6 @@ protected :
void* m_pictHandle ;
bool m_pictCreated ;
private:
// Virtual function hiding supression
size_t GetDataSize(const wxDataFormat& rFormat) const
{ return(wxDataObjectSimple::GetDataSize(rFormat)); }
bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const
{ return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); }
bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
{ return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
};
// ----------------------------------------------------------------------------
@@ -67,15 +72,19 @@ public:
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);
private:
// Virtual function hiding supression
size_t GetDataSize(const wxDataFormat& rFormat) const
{ return(wxDataObjectSimple::GetDataSize(rFormat)); }
bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const
{ return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); }
bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
{ return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
// Must provide overloads to avoid hiding them (and warnings about it)
virtual size_t GetDataSize(const wxDataFormat&) const
{
return GetDataSize();
}
virtual bool GetDataHere(const wxDataFormat&, void *buf) const
{
return GetDataHere(buf);
}
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
{
return SetData(len, buf);
}
};
#endif // _WX_GTK_DATAOBJ2_H_

13
include/wx/mac/carbon/dc.h
View File

@@ -108,12 +108,6 @@ public:
virtual wxCoord GetCharHeight() const;
virtual wxCoord GetCharWidth() const;
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = NULL,
wxCoord *externalLeading = NULL,
wxFont *theFont = NULL) const;
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
virtual bool CanDrawBitmap() const;
virtual bool CanGetTextExtent() const;
@@ -229,6 +223,13 @@ public:
#endif
protected:
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = NULL,
wxCoord *externalLeading = NULL,
wxFont *theFont = NULL) const;
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
int style = wxFLOOD_SURFACE);

6
include/wx/mac/carbon/dcclient.h
View File

@@ -32,8 +32,8 @@ class WXDLLEXPORT wxWindowDC: public wxDC
wxWindowDC(wxWindow *win);
~wxWindowDC(void);
virtual void DoGetSize( int *width, int *height ) const;
protected :
virtual void DoGetSize( int *width, int *height ) const;
wxWindow *m_window;
};
@@ -49,6 +49,8 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
wxClientDC(wxWindow *win);
~wxClientDC(void);
protected:
virtual void DoGetSize( int *width, int *height ) const;
};
@@ -63,6 +65,8 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
wxPaintDC(wxWindow *win);
~wxPaintDC(void);
protected:
virtual void DoGetSize( int *width, int *height ) const;
};

5
include/wx/mac/carbon/dcmemory.h
View File

@@ -23,8 +23,11 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
wxMemoryDC( wxDC *dc ); // Create compatible DC
~wxMemoryDC(void);
virtual void SelectObject( const wxBitmap& bitmap );
virtual void DoGetSize( int *width, int *height ) const;
wxBitmap GetSelectedObject() { return m_selected ; }
protected:
virtual void DoGetSize( int *width, int *height ) const;
private:
wxBitmap m_selected;
};

2
include/wx/mac/carbon/dcprint.h
View File

@@ -32,11 +32,11 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
virtual void StartPage(void) ;
virtual void EndPage(void) ;
wxPrintData& GetPrintData() { return m_printData; }
virtual void DoGetSize( int *width, int *height ) const;
#if wxMAC_USE_CORE_GRAPHICS
void MacSetCGContext( void * cg ) ;
#endif
protected:
virtual void DoGetSize( int *width, int *height ) const;
wxPrintData m_printData ;
wxNativePrinterDC* m_nativePrinterDC ;
#endif // wxUSE_PRINTING_ARCHITECTURE

3
include/wx/mac/carbon/filedlg.h
View File

@@ -36,7 +36,8 @@ public:
virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
virtual int ShowModal();
protected:
// not supported for file dialog, RR
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height),

12
include/wx/mac/carbon/frame.h
View File

@@ -72,7 +72,6 @@ public:
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
virtual void PositionToolBar();
virtual void SetToolBar(wxToolBar *toolbar);
#endif // wxUSE_TOOLBAR
@@ -82,8 +81,6 @@ public:
long style = wxST_SIZEGRIP,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
virtual void PositionStatusBar();
#endif // wxUSE_STATUSBAR
// tooltip management
@@ -97,10 +94,19 @@ public:
void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
wxWindow *GetLastFocus() const { return m_winLastFocused; }
void PositionBars();
protected:
// common part of all ctors
void Init();
#if wxUSE_TOOLBAR
virtual void PositionToolBar();
#endif
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
#endif
// override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);

24
include/wx/mac/carbon/listbox.h
View File

@@ -83,22 +83,9 @@ public:
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual bool IsSelected(int n) const;
virtual void DoSetSelection(int n, bool select);
virtual int GetSelection() const;
virtual int GetSelections(wxArrayInt& aSelections) const;
virtual int DoAppend(const wxString& item);
virtual void DoInsertItems(const wxArrayString& items, int pos);
virtual void DoSetItems(const wxArrayString& items, void **clientData);
virtual void DoSetFirstItem(int n);
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
// wxCheckListBox support
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
@@ -116,6 +103,17 @@ public:
// events in the latter case
bool MacIsSelectionSuppressed() const { return m_suppressSelection ; }
protected:
virtual void DoSetSelection(int n, bool select);
virtual int DoAppend(const wxString& item);
virtual void DoInsertItems(const wxArrayString& items, int pos);
virtual void DoSetItems(const wxArrayString& items, void **clientData);
virtual void DoSetFirstItem(int n);
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void MacDelete( int n ) ;
void MacInsert( int n , const wxString& item) ;
void MacAppend( const wxString& item) ;

9
include/wx/mac/carbon/mdi.h
View File

@@ -179,15 +179,14 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow
// Note: this is virtual, to allow overridden behaviour.
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
// Gets the size available for subwindows after menu size, toolbar size
// and status bar size have been subtracted. If you want to manage your own
// toolbar(s), don't call SetToolBar.
void DoGetClientSize(int *width, int *height) const;
// Explicitly call default scroll behaviour
void OnScroll(wxScrollEvent& event);
protected:
// Gets the size available for subwindows after menu size, toolbar size
// and status bar size have been subtracted. If you want to manage your own
// toolbar(s), don't call SetToolBar.
void DoGetClientSize(int *width, int *height) const;
DECLARE_EVENT_TABLE()
};

9
include/wx/mac/carbon/menu.h
View File

@@ -31,10 +31,6 @@ public:
virtual ~wxMenu();
// implement base class virtuals
virtual wxMenuItem* DoAppend(wxMenuItem *item);
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
virtual wxMenuItem* DoRemove(wxMenuItem *item);
virtual void Attach(wxMenuBarBase *menubar) ;
virtual void Break();
@@ -65,6 +61,11 @@ public:
short MacGetMenuId() { return m_macMenuId ; }
protected:
virtual wxMenuItem* DoAppend(wxMenuItem *item);
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
virtual wxMenuItem* DoRemove(wxMenuItem *item);
private:
// common part of all ctors
void Init();

3
include/wx/mac/carbon/metafile.h
View File

@@ -85,13 +85,14 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
// Should be called at end of drawing
virtual wxMetafile *Close(void);
virtual void DoGetSize(int *width, int *height) const ;
// Implementation
inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
protected:
virtual void DoGetSize(int *width, int *height) const;
wxMetafile* m_metaFile;
};

1
include/wx/mac/carbon/msgdlg.h
View File

@@ -39,6 +39,7 @@ public:
int ShowModal();
protected:
// not supported for message dialog, RR
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height),

3
include/wx/mac/carbon/notebook.h
View File

@@ -114,9 +114,10 @@ public:
// base class virtuals
// -------------------
virtual void Command(wxCommandEvent& event);
virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event);
protected:
virtual wxNotebookPage *DoRemovePage(size_t page) ;
virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
// common part of all ctors
void Init();

8
include/wx/mac/carbon/slider.h
View File

@@ -79,15 +79,15 @@ public:
int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1 );
void Command(wxCommandEvent& event);
virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event);
void MacHandleControlClick(WXWidget control, wxInt16 controlpart, bool mouseStillDown);
protected:
virtual wxSize DoGetBestSize() const;
virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags);
virtual void DoMoveWindow(int x, int y, int w, int h);
void Command(wxCommandEvent& event);
virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
// Common processing to invert slider values based on wxSL_INVERSE
virtual int ValueInvertOrNot(int value) const;

3
include/wx/mac/carbon/statbmp.h
View File

@@ -53,9 +53,10 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
virtual wxSize DoGetBestSize() const ;
protected:
virtual wxSize DoGetBestSize() const;
wxBitmap m_bitmap;
DECLARE_EVENT_TABLE()
};

3
include/wx/mac/carbon/stattext.h
View File

@@ -38,10 +38,11 @@ public:
void SetLabel( const wxString &str ) ;
bool SetFont( const wxFont &font );
virtual bool AcceptsFocus() const { return FALSE; }
protected :
virtual wxSize DoGetBestSize() const ;
virtual bool AcceptsFocus() const { return FALSE; }
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};

5
include/wx/mac/carbon/toolbar.h
View File

@@ -50,8 +50,6 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
virtual bool Show(bool show = true);
virtual bool IsShown() const;
virtual void DoGetSize(int *width, int *height) const;
virtual wxSize DoGetBestSize() const ;
virtual bool Realize();
virtual void SetToolBitmapSize(const wxSize& size);
@@ -75,7 +73,8 @@ protected:
// common part of all ctors
void Init();
// implement base class pure virtuals
virtual void DoGetSize(int *width, int *height) const;
virtual wxSize DoGetBestSize() const;
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);

4
include/wx/mac/carbon/window.h
View File

@@ -82,9 +82,9 @@ public:
int *externalLeading = NULL,
const wxFont *theFont = NULL )
const;
protected:
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
public:
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = true );
virtual void SetScrollPos( int orient, int pos, bool refresh = true );