projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added correct pen styles for wxDOT etc as well as wxSTIPPLE implementation for 8x8...
[wxWidgets.git]
/
src
/
mac
/
carbon
/
bmpbuttn.cpp
diff --git
a/src/mac/carbon/bmpbuttn.cpp
b/src/mac/carbon/bmpbuttn.cpp
index dbbfc52d7a6522ec580ed1f53a944d7467cd579e..2a93999107c337aa77dfac453f15962eece424b4 100644
(file)
--- a/
src/mac/carbon/bmpbuttn.cpp
+++ b/
src/mac/carbon/bmpbuttn.cpp
@@
-13,15
+13,15
@@
#pragma implementation "bmpbuttn.h"
#endif
#pragma implementation "bmpbuttn.h"
#endif
+#include "wx/window.h"
#include "wx/bmpbuttn.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#endif
#include "wx/bmpbuttn.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#endif
-#include <wx/mac/uma.h>
-
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
+#include "wx/mac/uma.h"
+#include "wx/bitmap.h"
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos,
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos,
@@
-57,7
+57,7
@@
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
MacPreControlCreate( parent , id , "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
MacPreControlCreate( parent , id , "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
- m_macControl =
UMANewControl( parent->GetMac
RootWindow() , &bounds , title , false , 0 ,
+ m_macControl =
::NewControl( parent->MacGet
RootWindow() , &bounds , title , false , 0 ,
kControlBehaviorOffsetContents +
( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0,
(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
kControlBehaviorOffsetContents +
( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0,
(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
@@
-69,19
+69,22
@@
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
if ( m_buttonBitmap.Ok() )
{
if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
if ( m_buttonBitmap.Ok() )
{
if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
-
info.contentType = kControlContentPictHandle ;
- info.u.picture = bmap->m_hPict ;
+ info.contentType = kControlContentPictHandle ;
+
info.u.picture = bmap->m_hPict ;
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
- info.contentType = kControlContentPictHandle ;
if ( m_buttonBitmap.GetMask() )
{
if ( m_buttonBitmap.GetMask() )
{
- info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+ 8 , 16 ) ;
}
else
{
}
else
{
- info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+ 8 , 16 ) ;
}
}
else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
}
}
else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
@@
-91,7
+94,7
@@
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
}
}
}
}
-
UMA
SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+
::
SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
MacPostControlCreate() ;
MacPostControlCreate() ;
@@
-106,21
+109,23
@@
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
if ( m_buttonBitmap.Ok() )
{
wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
if ( m_buttonBitmap.Ok() )
{
wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- {
- info.contentType = kControlContentPictHandle ;
- info.u.picture = bmap->m_hPict ;
+ if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+ info.contentType = kControlContentPictHandle ;
+ info.u.picture = bmap->m_hPict ;
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
- info.contentType = kControlContentPictHandle ;
if ( m_buttonBitmap.GetMask() )
{
if ( m_buttonBitmap.GetMask() )
{
- info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+ 8 , 16 ) ;
}
else
{
}
else
{
- info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+ 8 , 16 ) ;
}
}
else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
}
}
else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
@@
-128,8
+133,9
@@
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
info.contentType = kControlContentCIconHandle ;
info.u.cIconHandle = bmap->m_hIcon ;
}
info.contentType = kControlContentCIconHandle ;
info.u.cIconHandle = bmap->m_hIcon ;
}
+
-
UMA
SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+
::
SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
}
}
}
}