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

Add OSX prefix, and be clear that this is OS X only API to avoid any expectation that this API may work elsewhere.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-12-09 05:25:32 +00:00
parent 94b6ce7f4b
commit ebf7d5c40a
7 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/cocoa/private.h
View File

@@ -246,7 +246,7 @@ public :
virtual bool IsActive(); virtual bool IsActive();
virtual void SetModified(bool modified); virtual void SetModified(bool modified);
virtual bool GetModified() const; virtual bool IsModified() const;
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
protected : protected :

2
include/wx/osx/core/private.h
View File

@@ -755,7 +755,7 @@ public :
long style, long extraStyle, const wxString& name ) ; long style, long extraStyle, const wxString& name ) ;
virtual void SetModified(bool WXUNUSED(modified)) { } virtual void SetModified(bool WXUNUSED(modified)) { }
virtual bool GetModified() const { return false; } virtual bool IsModified() const { return false; }
protected : protected :
wxNonOwnedWindow* m_wxPeer; wxNonOwnedWindow* m_wxPeer;

4
include/wx/osx/toplevel.h
View File

@@ -75,8 +75,8 @@ public:
virtual void SetTitle( const wxString& title); virtual void SetTitle( const wxString& title);
virtual wxString GetTitle() const; virtual wxString GetTitle() const;
virtual void SetModified(bool modified); virtual void OSXSetModified(bool modified);
virtual bool GetModified() const; virtual bool OSXIsModified() const;
protected: protected:
// common part of all ctors // common part of all ctors

4
include/wx/toplevel.h
View File

@@ -257,8 +257,8 @@ public:
virtual void SetMinSize(const wxSize& minSize); virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize); virtual void SetMaxSize(const wxSize& maxSize);
virtual void SetModified(bool modified) { m_modified = modified; } virtual void OSXSetModified(bool modified) { m_modified = modified; }
virtual bool GetModified() const { return m_modified; } virtual bool OSXIsModified() const { return m_modified; }
protected: protected:
// the frame client to screen translation should take account of the // the frame client to screen translation should take account of the

17
interface/wx/toplevel.h
View File

@@ -441,16 +441,21 @@ public:
virtual bool ShouldPreventAppExit() const; virtual bool ShouldPreventAppExit() const;
/** /**
This function sets the wxTopLevelWindow's modified state, so that the This function sets the wxTopLevelWindow's modified state on OS X,
wxTopLevelWindow can change its GUI to reflect the current state. (e.g. on which currently draws a black dot in the wxTopLevelWindow's close button.
Mac, the close button gets a black dot to reflect that there are unsaved changes) On other platforms, this method does nothing.
@see OSXIsModified()
*/ */
virtual void SetModified(bool modified); virtual void OSXSetModified(bool modified);
/** /**
Returns the current modified state of the wxTopLevelWindow. Returns the current modified state of the wxTopLevelWindow on OS X.
On other platforms, this method does nothing.
@see OSXSetModified()
*/ */
virtual bool GetModified() const; virtual bool OSXIsModified() const;
/** /**
Depending on the value of @a show parameter the window is either shown Depending on the value of @a show parameter the window is either shown

2
src/osx/cocoa/nonownedwnd.mm
View File

@@ -732,7 +732,7 @@ void wxNonOwnedWindowCocoaImpl::SetModified(bool modified)
[m_macWindow setDocumentEdited:modified]; [m_macWindow setDocumentEdited:modified];
} }
bool wxNonOwnedWindowCocoaImpl::GetModified() const bool wxNonOwnedWindowCocoaImpl::IsModified() const
{ {
return [m_macWindow isDocumentEdited]; return [m_macWindow isDocumentEdited];
} }

8
src/osx/toplevel_osx.cpp
View File

@@ -187,12 +187,12 @@ bool wxTopLevelWindowMac::IsActive()
return m_nowpeer->IsActive(); return m_nowpeer->IsActive();
} }
void wxTopLevelWindowMac::SetModified(bool modified) void wxTopLevelWindowMac::OSXSetModified(bool modified)
{ {
m_nowpeer->SetModified(modified); m_nowpeer->SetModified(modified);
} }
bool wxTopLevelWindowMac::GetModified() const bool wxTopLevelWindowMac::OSXIsModified() const
{ {
return m_nowpeer->GetModified(); return m_nowpeer->IsModified();
} }