X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9e02ac76b28a6787e7714a5c1f6ade2d46cd7a0..c88597ef2645c2e2102bc6fc1e16dde4812df313:/src/motif/bmpbuttn.cpp?ds=inline diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp index 9d30cc7d6c..87bca5cdb1 100644 --- a/src/motif/bmpbuttn.cpp +++ b/src/motif/bmpbuttn.cpp @@ -6,17 +6,29 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "bmpbuttn.h" #endif +#ifdef __VMS +#define XtScreen XTSCREEN +#endif + +#include "wx/defs.h" + #include "wx/bmpbuttn.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" @@ -25,9 +37,7 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr); Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap ); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif wxBitmapButton::wxBitmapButton() { @@ -36,10 +46,10 @@ wxBitmapButton::wxBitmapButton() } bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) { m_buttonBitmap = bitmap; m_buttonBitmapOriginal = bitmap; @@ -56,12 +66,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit m_marginX = 0; m_marginY = 0; -/* + /* int x = pos.x; int y = pos.y; int width = size.x; int height = size.y; -*/ + */ if (id == -1) m_windowId = NewControlId(); @@ -70,29 +80,29 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit Widget parentWidget = (Widget) parent->GetClientWidget(); - /* - * Patch Note (important) - * There is no major reason to put a defaultButtonThickness here. - * Not requesting it give the ability to put wxButton with a spacing - * as small as requested. However, if some button become a DefaultButton, - * other buttons are no more aligned -- This is why we set - * defaultButtonThickness of ALL buttons belonging to the same wxPanel, - * in the ::SetDefaultButton method. - */ + /* + * Patch Note (important) + * There is no major reason to put a defaultButtonThickness here. + * Not requesting it give the ability to put wxButton with a spacing + * as small as requested. However, if some button become a DefaultButton, + * other buttons are no more aligned -- This is why we set + * defaultButtonThickness of ALL buttons belonging to the same wxPanel, + * in the ::SetDefaultButton method. + */ Widget buttonWidget = XtVaCreateManagedWidget ("button", - // Gadget causes problems for default button operation. + // Gadget causes problems for default button operation. #if wxUSE_GADGETS - xmPushButtonGadgetClass, parentWidget, + xmPushButtonGadgetClass, parentWidget, #else - xmPushButtonWidgetClass, parentWidget, + xmPushButtonWidgetClass, parentWidget, #endif -// XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault - NULL); + // XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault + NULL); m_mainWidget = (WXWidget) buttonWidget; - m_windowFont = parent->GetFont(); + m_font = parent->GetFont(); ChangeFont(FALSE); ChangeBackgroundColour (); @@ -100,7 +110,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit DoSetBitmap(); XtAddCallback (buttonWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback, - (XtPointer) this); + (XtPointer) this); SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); @@ -160,11 +170,11 @@ void wxBitmapButton::DoSetBitmap() { int backgroundPixel; XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel, - NULL); + NULL); wxColour col; col.SetPixel(backgroundPixel); - + wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col); m_buttonBitmap = newBitmap; @@ -179,11 +189,11 @@ void wxBitmapButton::DoSetBitmap() { int backgroundPixel; XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel, - NULL); + NULL); wxColour col; col.SetPixel(backgroundPixel); - + wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col); m_buttonBitmapDisabled = newBitmap; @@ -202,21 +212,21 @@ void wxBitmapButton::DoSetBitmap() { int backgroundPixel; XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel, - NULL); + NULL); wxColour col; col.SetPixel(backgroundPixel); - + wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapSelectedOriginal, col); m_buttonBitmapSelected = newBitmap; armPixmap = (Pixmap) m_buttonBitmapSelected.GetPixmap(); } else - armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget); + armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget); } else - armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget); + armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget); if (insensPixmap == pixmap) // <- the Get...Pixmap()-functions return the same pixmap! { @@ -239,7 +249,7 @@ void wxBitmapButton::DoSetBitmap() XtVaSetValues ((Widget) m_mainWidget, XmNlabelType, XmSTRING, XmNlabelPixmap, XmUNSPECIFIED_PIXMAP, - XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP, + XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP, XmNarmPixmap, XmUNSPECIFIED_PIXMAP, NULL); }