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

reintroducing non-composited functionality due to DataBrowser Bugs under 10.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-27 08:54:16 +00:00
parent 3a9929405b
commit 9b89f11ad8
2 changed files with 97 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,26 +411,12 @@ Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxS
class wxMacControl
{
public :
wxMacControl(wxWindow* peer)
{
m_peer = peer ;
m_controlRef = NULL ;
}
wxMacControl( wxWindow* peer) ;
wxMacControl( wxWindow* peer , ControlRef control ) ;
wxMacControl( wxWindow* peer , WXWidget control ) ;
virtual ~wxMacControl() ;
wxMacControl( wxWindow* peer , ControlRef control )
{
m_peer = peer ;
m_controlRef = control ;
}
wxMacControl( wxWindow* peer , WXWidget control )
{
m_peer = peer ;
m_controlRef = (ControlRef) control ;
}
virtual ~wxMacControl()
{
}
void Init() ;
virtual void Dispose() ;
@@ -469,6 +455,7 @@ public :
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
virtual bool NeedsFocusRect() const ;
virtual void SetNeedsFocusRect( bool needs ) ;
// templated helpers
@@ -570,11 +557,14 @@ public :
// to be moved into a tab control class
virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
bool IsCompositing() { return m_isCompositing ; }
protected :
ControlRef m_controlRef ;
wxFont m_font ;
long m_windowStyle ;
wxWindow* m_peer ;
bool m_needsFocusRect ;
bool m_isCompositing ;
} ;
#if wxMAC_USE_CORE_GRAPHICS
@@ -750,7 +740,7 @@ wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
// toplevel.cpp
ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, Point location , WindowRef window , ControlPartCode *outPart ) ;
// filefn.cpp