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

universal os x fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-06-13 04:05:37 +00:00
parent cc10fcc4a8
commit d3521487d4
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mac/carbon/private.h
View File

@@ -479,7 +479,7 @@ void wxMacNativeToRect( const Rect *n , wxRect* wx );
void wxMacPointToNative( const wxPoint* wx , Point *n ); void wxMacPointToNative( const wxPoint* wx , Point *n );
void wxMacNativeToPoint( const Point *n , wxPoint* wx ); void wxMacNativeToPoint( const Point *n , wxPoint* wx );
wxWindow * wxFindControlFromMacControl(ControlRef inControl ); wxWindowMac * wxFindControlFromMacControl(ControlRef inControl );
wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ); wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow );
wxMenu* wxFindMenuFromMacMenu(MenuRef inMenuRef); wxMenu* wxFindMenuFromMacMenu(MenuRef inMenuRef);
@@ -489,7 +489,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &macCommandId
extern wxWindow* g_MacLastWindow; extern wxWindow* g_MacLastWindow;
pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ); pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data );
Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ); Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true );
ControlActionUPP GetwxMacLiveScrollbarActionProc(); ControlActionUPP GetwxMacLiveScrollbarActionProc();

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

@@ -61,7 +61,9 @@ public:
virtual void Iconize(bool iconize = true); virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const; virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon); virtual void SetIcon(const wxIcon& icon);
#ifndef __WXUNIVERSAL__
virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); } virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
#endif
virtual void Restore(); virtual void Restore();
virtual bool SetShape(const wxRegion& region); virtual bool SetShape(const wxRegion& region);

8
src/common/dcgraph.cpp
View File

@@ -735,9 +735,10 @@ bool wxGCDC::DoBlit(
if ( logical_func == wxNO_OP ) if ( logical_func == wxNO_OP )
return true; return true;
else if ( logical_func != wxCOPY ) else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
{ {
wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") ); wxFAIL_MSG( wxT("Logical function is not supported by the graphics context.") );
return false; return false;
} }
@@ -776,6 +777,9 @@ bool wxGCDC::DoBlit(
return false; return false;
} }
// reset logical function
m_graphicContext->SetLogicalFunction( m_logicalFunction );
return true; return true;
} }

2
src/generic/listctrl.cpp
View File

@@ -25,7 +25,7 @@
#include "wx/listctrl.h" #include "wx/listctrl.h"
#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__) #if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!defined(__WXMAC__)|| defined(__WXUNIVERSAL__))
// if we have a native version, its implementation file does all this // if we have a native version, its implementation file does all this
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)