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

Derive wxBitmapButton from wxBitmapButtonBase + misc cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-03-16 08:50:21 +00:00
parent 3a73cc5203
commit ea9868e8d2
2 changed files with 70 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/motif/bmpbuttn.h
View File

@@ -16,20 +16,17 @@
#pragma interface "bmpbuttn.h" #pragma interface "bmpbuttn.h"
#endif #endif
#include "wx/button.h"
#include "wx/bitmap.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
#define wxDEFAULT_BUTTON_MARGIN 4 #define wxDEFAULT_BUTTON_MARGIN 4
class WXDLLEXPORT wxBitmapButton: public wxButton class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
{ {
DECLARE_DYNAMIC_CLASS(wxBitmapButton) DECLARE_DYNAMIC_CLASS(wxBitmapButton)
public: public:
wxBitmapButton(); wxBitmapButton();
~wxBitmapButton(); ~wxBitmapButton();
inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
@@ -55,38 +52,21 @@ public:
virtual void SetBitmapLabel(const wxBitmap& bitmap); virtual void SetBitmapLabel(const wxBitmap& bitmap);
inline wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; }
inline wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; }
inline wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; }
inline wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; }
void SetBitmapSelected(const wxBitmap& sel); void SetBitmapSelected(const wxBitmap& sel);
void SetBitmapFocus(const wxBitmap& focus); void SetBitmapFocus(const wxBitmap& focus);
void SetBitmapDisabled(const wxBitmap& disabled); void SetBitmapDisabled(const wxBitmap& disabled);
inline void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
inline int GetMarginX() { return m_marginX; }
inline int GetMarginY() { return m_marginY; }
// Implementation // Implementation
void DoSetBitmap(); void DoSetBitmap();
virtual void ChangeBackgroundColour(); virtual void ChangeBackgroundColour();
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
protected: protected:
wxBitmap m_buttonBitmapFocus; wxBitmap m_bmpNormalOriginal; // May be different from m_buttonBitmap
wxBitmap m_buttonBitmap;
wxBitmap m_buttonBitmapOriginal; // May be different from m_buttonBitmap
// if m_buttonBitmap has been changed // if m_buttonBitmap has been changed
// to reflect button background colour // to reflect button background colour
wxBitmap m_buttonBitmapSelected; wxBitmap m_bmpSelectedOriginal;
wxBitmap m_buttonBitmapSelectedOriginal; wxBitmap m_bmpDisabledOriginal;
wxBitmap m_buttonBitmapDisabled;
wxBitmap m_buttonBitmapDisabledOriginal;
int m_marginX;
int m_marginY;
WXPixmap m_insensPixmap; WXPixmap m_insensPixmap;
}; };

142
src/motif/bmpbuttn.cpp
View File

@@ -41,30 +41,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
wxBitmapButton::wxBitmapButton() wxBitmapButton::wxBitmapButton()
{ {
m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
m_insensPixmap = (WXPixmap) 0; m_insensPixmap = (WXPixmap) 0;
} }
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, long style, const wxSize& size, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
m_buttonBitmap = bitmap; if( !CreateControl( parent, id, pos, size, style, validator, name ) )
m_buttonBitmapOriginal = bitmap; return false;
m_buttonBitmapSelected = bitmap;
m_buttonBitmapSelectedOriginal = bitmap;
SetName(name); m_bmpNormal = m_bmpNormalOriginal = bitmap;
SetValidator(validator); m_bmpSelected = m_bmpSelectedOriginal = bitmap;
parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ;
m_windowStyle = style;
m_marginX = 0;
m_marginY = 0;
/* /*
int x = pos.x; int x = pos.x;
@@ -73,11 +65,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
int height = size.y; int height = size.y;
*/ */
if (id == -1)
m_windowId = NewControlId();
else
m_windowId = id;
Widget parentWidget = (Widget) parent->GetClientWidget(); Widget parentWidget = (Widget) parent->GetClientWidget();
/* /*
@@ -97,35 +84,31 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
#else #else
xmPushButtonWidgetClass, parentWidget, xmPushButtonWidgetClass, parentWidget,
#endif #endif
// XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault // See comment for wxButton::SetDefault
// XmNdefaultButtonShadowThickness, 1,
XmNrecomputeSize, False,
NULL); NULL);
m_mainWidget = (WXWidget) buttonWidget; m_mainWidget = (WXWidget) buttonWidget;
m_font = parent->GetFont();
ChangeFont(FALSE); ChangeFont(FALSE);
ChangeBackgroundColour (); ChangeBackgroundColour ();
DoSetBitmap(); DoSetBitmap();
XtAddCallback (buttonWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback, XtAddCallback (buttonWidget,
(XtPointer) this); XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
(XtPointer) this);
SetCanAddEventHandler(TRUE); SetCanAddEventHandler(TRUE);
wxSize newSize = size; wxSize best = m_bmpNormal.Ok() ? GetBestSize() : wxSize(30, 30);
if( size.x != -1 ) best.x = size.x;
if( size.y != -1 ) best.y = size.y;
if (m_buttonBitmap.Ok()) AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
{ pos.x, pos.y, best.x, best.y);
int border = (style & wxNO_BORDER) ? 4 : 10;
if (newSize.x == -1)
newSize.x = m_buttonBitmap.GetWidth()+border;
if (newSize.y == -1)
newSize.y = m_buttonBitmap.GetHeight()+border;
}
AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, newSize.x, newSize.y);
return TRUE; return TRUE;
} }
@@ -135,42 +118,43 @@ wxBitmapButton::~wxBitmapButton()
SetBitmapLabel(wxNullBitmap); SetBitmapLabel(wxNullBitmap);
if (m_insensPixmap) if (m_insensPixmap)
XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) GetXDisplay()), (Pixmap) m_insensPixmap); XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) GetXDisplay()),
(Pixmap) m_insensPixmap);
} }
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{ {
m_buttonBitmapOriginal = bitmap; m_bmpNormalOriginal = bitmap;
m_buttonBitmap = bitmap; m_bmpNormal = bitmap;
DoSetBitmap(); DoSetBitmap();
} }
void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel) void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
{ {
m_buttonBitmapSelected = sel; m_bmpSelected = sel;
m_buttonBitmapSelectedOriginal = sel; m_bmpSelectedOriginal = sel;
DoSetBitmap(); DoSetBitmap();
}; };
void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus) void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
{ {
m_buttonBitmapFocus = focus; m_bmpFocus = focus;
// Not used in Motif // Not used in Motif
}; };
void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled) void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
{ {
m_buttonBitmapDisabled = disabled; m_bmpDisabled = disabled;
m_buttonBitmapDisabledOriginal = disabled; m_bmpDisabledOriginal = disabled;
DoSetBitmap(); DoSetBitmap();
}; };
void wxBitmapButton::DoSetBitmap() void wxBitmapButton::DoSetBitmap()
{ {
if (m_buttonBitmapOriginal.Ok()) if (m_bmpNormalOriginal.Ok())
{ {
Pixmap pixmap = 0; Pixmap pixmap = 0;
Pixmap insensPixmap = 0; Pixmap insensPixmap = 0;
@@ -178,69 +162,76 @@ void wxBitmapButton::DoSetBitmap()
// Must re-make the bitmap to have its transparent areas drawn // Must re-make the bitmap to have its transparent areas drawn
// in the current widget background colour. // in the current widget background colour.
if (m_buttonBitmapOriginal.GetMask()) if (m_bmpNormalOriginal.GetMask())
{ {
int backgroundPixel; int backgroundPixel;
XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel, XtVaGetValues((Widget) m_mainWidget,
NULL); XmNbackground, &backgroundPixel,
NULL);
wxColour col; wxColour col;
col.SetPixel(backgroundPixel); col.SetPixel(backgroundPixel);
wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col); wxBitmap newBitmap =
m_buttonBitmap = newBitmap; wxCreateMaskedBitmap(m_bmpNormalOriginal, col);
m_bmpNormal = newBitmap;
pixmap = (Pixmap) m_buttonBitmap.GetPixmap(); pixmap = (Pixmap) m_bmpNormal.GetPixmap();
} }
else else
pixmap = (Pixmap) m_buttonBitmap.GetLabelPixmap(m_mainWidget); pixmap = (Pixmap) m_bmpNormal.GetLabelPixmap(m_mainWidget);
if (m_buttonBitmapDisabledOriginal.Ok()) if (m_bmpDisabledOriginal.Ok())
{ {
if (m_buttonBitmapDisabledOriginal.GetMask()) if (m_bmpDisabledOriginal.GetMask())
{ {
int backgroundPixel; int backgroundPixel;
XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel, XtVaGetValues((Widget) m_mainWidget,
NULL); XmNbackground, &backgroundPixel,
NULL);
wxColour col; wxColour col;
col.SetPixel(backgroundPixel); col.SetPixel(backgroundPixel);
wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col); wxBitmap newBitmap =
m_buttonBitmapDisabled = newBitmap; wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
m_bmpDisabled = newBitmap;
insensPixmap = (Pixmap) m_buttonBitmapDisabled.GetPixmap(); insensPixmap = (Pixmap) m_bmpDisabled.GetPixmap();
} }
else else
insensPixmap = (Pixmap) m_buttonBitmap.GetInsensPixmap(m_mainWidget); insensPixmap = (Pixmap) m_bmpNormal.GetInsensPixmap(m_mainWidget);
} }
else else
insensPixmap = (Pixmap) m_buttonBitmap.GetInsensPixmap(m_mainWidget); insensPixmap = (Pixmap) m_bmpNormal.GetInsensPixmap(m_mainWidget);
// Now make the bitmap representing the armed state // Now make the bitmap representing the armed state
if (m_buttonBitmapSelectedOriginal.Ok()) if (m_bmpSelectedOriginal.Ok())
{ {
if (m_buttonBitmapSelectedOriginal.GetMask()) if (m_bmpSelectedOriginal.GetMask())
{ {
int backgroundPixel; int backgroundPixel;
XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel, XtVaGetValues((Widget) m_mainWidget,
NULL); XmNarmColor, &backgroundPixel,
NULL);
wxColour col; wxColour col;
col.SetPixel(backgroundPixel); col.SetPixel(backgroundPixel);
wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapSelectedOriginal, col); wxBitmap newBitmap =
m_buttonBitmapSelected = newBitmap; wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
m_bmpSelected = newBitmap;
armPixmap = (Pixmap) m_buttonBitmapSelected.GetPixmap(); armPixmap = (Pixmap) m_bmpSelected.GetPixmap();
} }
else else
armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget); armPixmap = (Pixmap) m_bmpNormal.GetArmPixmap(m_mainWidget);
} }
else else
armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget); armPixmap = (Pixmap) m_bmpNormal.GetArmPixmap(m_mainWidget);
if (insensPixmap == pixmap) // <- the Get...Pixmap()-functions return the same pixmap! // <- the Get...Pixmap()-functions return the same pixmap!
if (insensPixmap == pixmap)
{ {
insensPixmap = insensPixmap =
XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap); XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap);
@@ -279,16 +270,11 @@ wxSize wxBitmapButton::DoGetBestSize() const
{ {
wxSize ret( 30,30 ); wxSize ret( 30,30 );
if (m_buttonBitmap.Ok()) if (m_bmpNormal.Ok())
{ {
int border = (GetWindowStyle() & wxNO_BORDER) ? 4 : 10; int border = (GetWindowStyle() & wxNO_BORDER) ? 4 : 10;
ret.x = m_buttonBitmap.GetWidth()+border; ret.x = m_bmpNormal.GetWidth()+border;
ret.y = m_buttonBitmap.GetHeight()+border; ret.y = m_bmpNormal.GetHeight()+border;
}
if (!HasFlag(wxBU_EXACTFIT))
{
if (ret.x < 80) ret.x = 80;
} }
return ret; return ret;