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

added support for bitmaps in wxButton to wxOSX/Cocoa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-21 03:01:53 +00:00
parent b727fcd3ad
commit e5d05b907c
10 changed files with 135 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/osx/button.h
View File

@@ -9,16 +9,14 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
#ifndef _WX_OSX_BUTTON_H_
#define _WX_OSX_BUTTON_H_
#include "wx/control.h"
#include "wx/gdicmn.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
// Pushbutton
class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
{
public:
wxButton() {}
@@ -50,16 +48,23 @@ public:
virtual void Command(wxCommandEvent& event);
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:
virtual wxSize DoGetBestSize() const ;
#if wxOSX_USE_COCOA
virtual wxBitmap DoGetBitmap(State which) const;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
virtual void DoSetBitmapPosition(wxDirection dir);
#endif // wxOSX_USE_COCOA
DECLARE_DYNAMIC_CLASS(wxButton)
};
class WXDLLIMPEXP_CORE wxDisclosureTriangle: public wxControl
// OS X specific class, not part of public wx API
class WXDLLIMPEXP_CORE wxDisclosureTriangle : public wxControl
{
public:
wxDisclosureTriangle(wxWindow *parent,
@@ -87,13 +92,12 @@ public:
bool IsOpen() const;
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:
virtual wxSize DoGetBestSize() const ;
};
#endif
// _WX_BUTTON_H_
#endif // _WX_OSX_BUTTON_H_

2
include/wx/osx/carbon/private.h
View File

@@ -335,7 +335,9 @@ public :
wxInt32 GetValue() const;
void SetValue( wxInt32 v );
wxBitmap GetBitmap() const;
void SetBitmap( const wxBitmap& bitmap );
void SetBitmapPosition( wxDirection dir );
void SetupTabs( const wxNotebook &notebook );
void GetBestRect( wxRect *r ) const;

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

@@ -106,7 +106,9 @@ public :
wxInt32 GetValue() const;
void SetValue( wxInt32 v );
wxBitmap GetBitmap() const;
void SetBitmap( const wxBitmap& bitmap );
void SetBitmapPosition( wxDirection dir );
void SetupTabs( const wxNotebook &notebook );
void GetBestRect( wxRect *r ) const;
bool IsEnabled() const;

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

@@ -235,7 +235,9 @@ public :
virtual wxInt32 GetValue() const = 0;
virtual void SetValue( wxInt32 v ) = 0;
virtual wxBitmap GetBitmap() const = 0;
virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
virtual void SetBitmapPosition( wxDirection dir ) = 0;
virtual void SetupTabs( const wxNotebook &notebook ) =0;
virtual void GetBestRect( wxRect *r ) const = 0;
virtual bool IsEnabled() const = 0;