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/univ/button.h
View File

@@ -100,17 +100,18 @@ public:
virtual void Release();
virtual void Click();
protected:
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
virtual bool CanBeHighlighted() const { return true; }
protected:
virtual wxSize DoGetBestClientSize() const;
virtual bool DoDrawBackground(wxDC& dc);
virtual void DoDraw(wxControlRenderer *renderer);
virtual bool CanBeHighlighted() const { return true; }
// common part of all ctors
void Init();

11
include/wx/univ/checkbox.h
View File

@@ -97,18 +97,19 @@ public:
// overridden base class virtuals
virtual bool IsPressed() const { return m_isPressed; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
virtual bool CanBeHighlighted() const { return true; }
protected:
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));
virtual wxCheckBoxState DoGet3StateValue() const;
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxSize DoGetBestClientSize() const;
virtual bool CanBeHighlighted() const { return true; }
// get the size of the bitmap using either the current one or the default
// one (query renderer then)
virtual wxSize GetBitmapSize() const;

10
include/wx/univ/combobox.h
View File

@@ -163,6 +163,11 @@ public:
virtual void DoSetToolTip( wxToolTip *tip );
#endif // wxUSE_TOOLTIPS
// we have our own input handler and our own actions
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0l,
const wxString& strArg = wxEmptyString);
protected:
// override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestClientSize() const;
@@ -171,11 +176,6 @@ protected:
int width, int height,
int sizeFlags = wxSIZE_AUTO);
// we have our own input handler and our own actions
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0l,
const wxString& strArg = wxEmptyString);
// event handlers
void OnKey(wxKeyEvent& event);

6
include/wx/univ/frame.h
View File

@@ -54,7 +54,6 @@ public:
virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr);
virtual void PositionToolBar();
#endif // wxUSE_TOOLBAR
virtual int GetMinWidth() const;
@@ -82,6 +81,11 @@ protected:
virtual void PositionStatusBar();
#endif // wxUSE_MENUS
protected:
#if wxUSE_TOOLBAR
virtual void PositionToolBar();
#endif // wxUSE_TOOLBAR
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};

2
include/wx/univ/listbox.h
View File

@@ -109,11 +109,11 @@ public:
virtual bool IsSelected(int n) const
{ return m_selections.Index(n) != wxNOT_FOUND; }
virtual void DoSetSelection(int n, bool select);
virtual int GetSelection() const;
virtual int GetSelections(wxArrayInt& aSelections) const;
protected:
virtual void DoSetSelection(int n, bool select);
virtual int DoAppendOnly(const wxString& item);
virtual int DoAppend(const wxString& item);
virtual void DoInsertItems(const wxArrayString& items, int pos);

8
include/wx/univ/slider.h
View File

@@ -121,6 +121,10 @@ public:
// for wxStdSliderButtonInputHandler
wxScrollThumb& GetThumb() { return m_thumb; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
protected:
enum
{
@@ -132,10 +136,6 @@ protected:
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
// event handlers
void OnSize(wxSizeEvent& event);

8
include/wx/univ/spinbutt.h
View File

@@ -58,15 +58,15 @@ public:
// for wxStdSpinButtonInputHandler
const wxScrollArrows& GetArrows() { return m_arrows; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
protected:
virtual wxSize DoGetBestClientSize() const;
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
// the common part of all ctors
void Init();

5
include/wx/univ/statbmp.h
View File

@@ -60,10 +60,11 @@ public:
wxIcon GetIcon() const;
virtual bool HasTransparentBackground() { return true; }
private:
protected:
virtual void DoDraw(wxControlRenderer *renderer);
private:
// the bitmap which we show
wxBitmap m_bitmap;

8
include/wx/univ/statbox.h
View File

@@ -47,6 +47,10 @@ public:
// take account of this
virtual wxPoint GetBoxAreaOrigin() const;
// returning true from here ensures that we act as a container window for
// our children
virtual bool IsStaticBox() const { return true; }
protected:
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
@@ -54,10 +58,6 @@ protected:
// get the size of the border
wxRect GetBorderGeometry() const;
// returning true from here ensures that we act as a container window for
// our children
virtual bool IsStaticBox() const { return true; }
private:
DECLARE_DYNAMIC_CLASS(wxStaticBox)
};

8
include/wx/univ/statusbr.h
View File

@@ -58,6 +58,10 @@ public:
virtual int GetBorderX() const;
virtual int GetBorderY() const;
// wxInputConsumer pure virtual
virtual wxWindow *GetInputWindow() const
{ return wx_const_cast(wxStatusBar*, this); }
protected:
// recalculate the field widths
void OnSize(wxSizeEvent& event);
@@ -65,10 +69,6 @@ protected:
// draw the statusbar
virtual void DoDraw(wxControlRenderer *renderer);
// wxInputConsumer pure virtual
virtual wxWindow *GetInputWindow() const
{ return wxConstCast(this, wxStatusBar); }
// tell them about our preferred height
virtual wxSize DoGetBestSize() const;

19
include/wx/univ/textctrl.h
View File

@@ -219,9 +219,6 @@ public:
virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
// ensure we have correct default border
virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
// perform an action
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
@@ -239,7 +236,17 @@ public:
// only for wxStdTextCtrlInputHandler
void RefreshSelection();
// override wxScrollHelper method to prevent (auto)scrolling beyond the end
// of line
virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const;
// idle processing
virtual void OnInternalIdle();
protected:
// ensure we have correct default border
virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
// override base class methods
virtual void DoDrawBorder(wxDC& dc, const wxRect& rect);
virtual void DoDraw(wxControlRenderer *renderer);
@@ -425,10 +432,6 @@ protected:
void OnChar(wxKeyEvent& event);
void OnSize(wxSizeEvent& event);
// overrdie wxScrollHelper method to prevent (auto)scrolling beyond the end
// of line
virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const;
// return the struct containing control-type dependent data
struct wxTextSingleLineData& SData() { return *m_data.sdata; }
struct wxTextMultiLineData& MData() { return *m_data.mdata; }
@@ -442,8 +445,6 @@ protected:
bool DoCut();
bool DoPaste();
// idle processing
virtual void OnInternalIdle();
private:
// all these methods are for multiline text controls only

9
include/wx/univ/toolbar.h
View File

@@ -66,7 +66,10 @@ public:
virtual void SetMargins(int x, int y);
void SetMargins(const wxSize& size)
{ SetMargins((int) size.x, (int) size.y); }
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
protected:
// common part of all ctors
void Init();
@@ -89,10 +92,6 @@ protected:
const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
// implement wxUniversal methods
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
virtual wxSize DoGetBestClientSize() const;
virtual void DoSetSize(int x, int y,
int width, int height,

9
include/wx/univ/toplevel.h
View File

@@ -118,8 +118,6 @@ public:
// implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual wxPoint GetClientAreaOrigin() const;
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
virtual void SetIcons(const wxIconBundle& icons);
@@ -139,12 +137,15 @@ public:
virtual int GetMinWidth() const;
virtual int GetMinHeight() const;
virtual wxWindow *GetInputWindow() const { return wx_const_cast(wxTopLevelWindow*, this); }
protected:
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
// handle titlebar button click event
virtual void ClickTitleBarButton(long button);
virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
// return wxTOPLEVEL_xxx combination based on current state of the frame
long GetDecorationsStyle() const;

6
include/wx/univ/window.h
View File

@@ -106,8 +106,6 @@ public:
// NB: all menu related functions are implemented in menu.cpp
#if wxUSE_MENUS
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
// this is wxUniv-specific private method to be used only by wxMenu
void DismissPopupMenu();
#endif // wxUSE_MENUS
@@ -187,7 +185,9 @@ protected:
// common part of all ctors
void Init();
// overridden base class virtuals
#if wxUSE_MENUS
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
#endif // wxUSE_MENUS
// we deal with the scrollbars in these functions
virtual void DoSetClientSize(int width, int height);