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

removed non-const wxWindow::GetFont and GetCursor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-23 11:34:24 +00:00
parent 718970e590
commit 29094af062
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/window.h
View File

@@ -733,14 +733,12 @@ public:
if ( SetFont(font) ) if ( SetFont(font) )
m_hasFont = false; m_hasFont = false;
} }
const wxFont& GetFont() const { return DoGetFont(); } wxFont GetFont() const;
wxFont& GetFont() { return DoGetFont(); }
// set/retrieve the cursor for this window (SetCursor() returns true // set/retrieve the cursor for this window (SetCursor() returns true
// if the cursor was really changed) // if the cursor was really changed)
virtual bool SetCursor( const wxCursor &cursor ); virtual bool SetCursor( const wxCursor &cursor );
const wxCursor& GetCursor() const { return m_cursor; } const wxCursor& GetCursor() const { return m_cursor; }
wxCursor& GetCursor() { return m_cursor; }
#if wxUSE_CARET #if wxUSE_CARET
// associate a caret with the window // associate a caret with the window
@@ -1226,10 +1224,6 @@ private:
// the stack of windows which have captured the mouse // the stack of windows which have captured the mouse
static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext; static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext;
// implementation of both const and non-const versions of GetFont()
wxFont& DoGetFont() const;
DECLARE_ABSTRACT_CLASS(wxWindowBase) DECLARE_ABSTRACT_CLASS(wxWindowBase)
DECLARE_NO_COPY_CLASS(wxWindowBase) DECLARE_NO_COPY_CLASS(wxWindowBase)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()