Renamed wxDataViewCell to wxDataViewRenderer since the

[wxWidgets.git] / src / motif / bmpbuttn.cpp

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index b9dcbf8c9a0f229652483a571164706db0b02c20..de320bafb0882dec52cb60b28314241b5b21293c 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        src/motif/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:


@@ -16,8 +16,6 @@
 #define XtScreen XTSCREEN
 #endif
 
 #define XtScreen XTSCREEN
 #endif
 

-#include "wx/defs.h"
-

 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__
 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__


@@ -77,7 +75,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
         xmPushButtonWidgetClass, parentWidget,
 #endif
         // See comment for wxButton::SetDefault
         xmPushButtonWidgetClass, parentWidget,
 #endif
         // See comment for wxButton::SetDefault

-        // XmNdefaultButtonShadowThickness, 1, 
+        // XmNdefaultButtonShadowThickness, 1,

         XmNrecomputeSize, False,
         NULL);
 
         XmNrecomputeSize, False,
         NULL);
 


@@ -126,13 +124,13 @@ void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
     m_bmpSelectedOriginal = sel;
 
     DoSetBitmap();
     m_bmpSelectedOriginal = sel;
 
     DoSetBitmap();

-};
+}

 
 void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
 {
     m_bmpFocus = focus;
     // Not used in Motif
 
 void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
 {
     m_bmpFocus = focus;
     // Not used in Motif

-};
+}

 
 void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
 {
 
 void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
 {


@@ -140,7 +138,7 @@ void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
     m_bmpDisabledOriginal = disabled;
 
     DoSetBitmap();
     m_bmpDisabledOriginal = disabled;
 
     DoSetBitmap();

-};
+}

 
 void wxBitmapButton::DoSetBitmap()
 {
 
 void wxBitmapButton::DoSetBitmap()
 {


@@ -265,4 +263,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
 
     return ret;
 }
 
     return ret;
 }

-