AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,9 +60,6 @@ public:
virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const;
#ifndef __WXUNIVERSAL__
virtual void SetIcons(const wxIconBundle& icons);
#endif
virtual void Restore();
virtual bool SetShape(const wxRegion& region);
@ -129,7 +126,7 @@ protected:
// should the frame be maximized when it will be shown? set by Maximize()
// when it is called while the frame is hidden
bool m_maximizeOnShow;
WXWindow m_macWindow ;
wxWindowMac* m_macFocus ;
@ -156,6 +153,6 @@ private :
};
// list of all frames and modeless dialogs
extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
#endif // _WX_MSW_TOPLEVEL_H_

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

@ -314,11 +314,11 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
if( thisButtonIsFakeRight && ( mouseChord & 1U ) )
mouseChord = ((mouseChord & ~1U) | 2U);
if(mouseChord & 1U)
if(mouseChord & 1U)
wxevent.m_leftDown = true ;
if(mouseChord & 2U)
if(mouseChord & 2U)
wxevent.m_rightDown = true ;
if(mouseChord & 4U)
if(mouseChord & 4U)
wxevent.m_middleDown = true ;
// translate into wx types
@ -604,7 +604,6 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
currentMouseWindow->SetFocus();
}
ControlPartCode dummyPart ;
// 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
@ -1065,13 +1064,6 @@ wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const
return wxPoint(0, 0) ;
}
#ifndef __WXUNIVERSAL__
void wxTopLevelWindowMac::SetIcons( const wxIconBundle& icons )
{
// { SetIcon( icons.GetIcon( -1 ) ); }
}
#endif
void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
{
wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ;
@ -1108,7 +1100,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow(
}
void wxTopLevelWindowMac::DoMacCreateRealWindow(
wxWindow* parent,
wxWindow* parent,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
@ -1142,8 +1134,8 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ;
WindowGroupRef group = NULL ;
bool activationScopeSet = false;
WindowActivationScope activationScope = kWindowActivationScopeNone;
bool activationScopeSet = false;
WindowActivationScope activationScope = kWindowActivationScopeNone;
if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{
@ -1164,8 +1156,8 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
else
{
wclass = kPlainWindowClass ;
activationScopeSet = true;
activationScope = kWindowActivationScopeNone;
activationScopeSet = true;
activationScope = kWindowActivationScopeNone;
}
}
else if ( HasFlag( wxPOPUP_WINDOW ) )
@ -1236,7 +1228,7 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
if( parenttlw )
group = GetWindowGroupParent( GetWindowGroup( parenttlw ) );
}
attr |= kWindowCompositingAttribute;
#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
attr |= kWindowFrameworkScaledAttribute;
@ -1267,16 +1259,16 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
// setup a separate group for each window, so that overlays can be handled easily
WindowGroupRef overlaygroup = NULL;
verify_noerr( CreateWindowGroup( kWindowGroupAttrMoveTogether | kWindowGroupAttrLayerTogether | kWindowGroupAttrHideOnCollapse, &overlaygroup ));
verify_noerr( SetWindowGroupParent( overlaygroup, GetWindowGroup( (WindowRef) m_macWindow )));
verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , overlaygroup ));
if ( activationScopeSet )
{
verify_noerr( SetWindowActivationScope( (WindowRef) m_macWindow , activationScope ));
}
if ( activationScopeSet )
{
verify_noerr( SetWindowActivationScope( (WindowRef) m_macWindow , activationScope ));
}
// the create commands are only for content rect,
// so we have to set the size again as structure bounds