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

Merge branch 'osx-set-color-without-font'

Browse Source 
Set colour without changing font in wxOSX.

See https://github.com/wxWidgets/wxWidgets/pull/2278
This commit is contained in:
Vadim Zeitlin
2021-04-04 14:19:39 +02:00
parent 31bcf15209 ac4634b294
commit 5f482e15ab
7 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,7 @@ public :
virtual void SetBackgroundColour(const wxColour&) wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual void SetForegroundColour(const wxColour& col) wxOVERRIDE;
virtual void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
virtual void Move(int x, int y, int width, int height) wxOVERRIDE;
@@ -241,6 +242,10 @@ protected:
// was the wx event for the current native key down event sent
bool WasKeyDownSent() const;
// Return the view to apply the font/colour to.
NSView* GetViewWithText() const;
NSEvent* m_lastKeyDownEvent;
bool m_lastKeyDownWXSent;
#if !wxOSX_USE_NATIVE_FLIPPED

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

@@ -276,6 +276,7 @@ public :
virtual void SetBackgroundColour( const wxColour& col ) = 0;
virtual bool SetBackgroundStyle(wxBackgroundStyle style) = 0;
virtual void SetForegroundColour( const wxColour& col ) = 0;
// all coordinates in native parent widget relative coordinates
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;

1
include/wx/osx/iphone/private.h
View File

@@ -56,6 +56,7 @@ public :
virtual void SetBackgroundColour( const wxColour& col ) ;
virtual bool SetBackgroundStyle(wxBackgroundStyle style) ;
virtual void SetForegroundColour( const wxColour& col ) ;
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const;
virtual void Move(int x, int y, int width, int height);

1
include/wx/osx/window.h
View File

@@ -342,7 +342,6 @@ protected:
bool MacHasScrollBarCorner() const;
void MacCreateScrollBars( long style ) ;
void MacRepositionScrollBars() ;
void MacUpdateControlFont() ;
// implement the base class pure virtuals
virtual void DoGetTextExtent(const wxString& string,