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

removed not implemented anyhow SetIcons()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-18 17:45:27 +00:00
parent 476bd16521
commit 0d6fba3793
2 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,6 @@ public:
virtual bool IsMaximized() const; virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = true); virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const; virtual bool IsIconized() const;
#ifndef __WXUNIVERSAL__
virtual void SetIcons(const wxIconBundle& icons);
#endif
virtual void Restore(); virtual void Restore();
virtual bool SetShape(const wxRegion& region); virtual bool SetShape(const wxRegion& region);

24
src/mac/carbon/toplevel.cpp
View File

@@ -604,7 +604,6 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
currentMouseWindow->SetFocus(); currentMouseWindow->SetFocus();
} }
ControlPartCode dummyPart ;
// if built-in find control is finding the wrong control (ie static box instead of overlaid // if built-in find control is finding the wrong control (ie static box instead of overlaid
// button, we cannot let the standard handler do its job, but must handle manually // button, we cannot let the standard handler do its job, but must handle manually
@@ -1065,13 +1064,6 @@ wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const
return wxPoint(0, 0) ; return wxPoint(0, 0) ;
} }
#ifndef __WXUNIVERSAL__
void wxTopLevelWindowMac::SetIcons( const wxIconBundle& icons )
{
// { SetIcon( icons.GetIcon( -1 ) ); }
}
#endif
void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
{ {
wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ; wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ;
@@ -1142,8 +1134,8 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
WindowClass wclass = 0; WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ; WindowAttributes attr = kWindowNoAttributes ;
WindowGroupRef group = NULL ; WindowGroupRef group = NULL ;
bool activationScopeSet = false; bool activationScopeSet = false;
WindowActivationScope activationScope = kWindowActivationScopeNone; WindowActivationScope activationScope = kWindowActivationScopeNone;
if ( HasFlag( wxFRAME_TOOL_WINDOW) ) if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{ {
@@ -1164,8 +1156,8 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
else else
{ {
wclass = kPlainWindowClass ; wclass = kPlainWindowClass ;
activationScopeSet = true; activationScopeSet = true;
activationScope = kWindowActivationScopeNone; activationScope = kWindowActivationScopeNone;
} }
} }
else if ( HasFlag( wxPOPUP_WINDOW ) ) else if ( HasFlag( wxPOPUP_WINDOW ) )
@@ -1273,10 +1265,10 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
verify_noerr( SetWindowGroupParent( overlaygroup, GetWindowGroup( (WindowRef) m_macWindow ))); verify_noerr( SetWindowGroupParent( overlaygroup, GetWindowGroup( (WindowRef) m_macWindow )));
verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , overlaygroup )); verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , overlaygroup ));
if ( activationScopeSet ) if ( activationScopeSet )
{ {
verify_noerr( SetWindowActivationScope( (WindowRef) m_macWindow , activationScope )); verify_noerr( SetWindowActivationScope( (WindowRef) m_macWindow , activationScope ));
} }
// the create commands are only for content rect, // the create commands are only for content rect,
// so we have to set the size again as structure bounds // so we have to set the size again as structure bounds