revert removal of gtk1 code from common file

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index b9259f8d3a71ed69204d820d41202e4d15e67acd..b22d663095d05cdcb73e03601fbc733f931fc6a7 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -1,23 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/motif/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statbmp.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/statbmp.h"
 
 #ifdef __VMS__
@@ -55,7 +49,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
-#if USE_GADGETS
+#if wxUSE_GADGETS
                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,
@@ -67,7 +61,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     DoSetBitmap();
 
-    ChangeFont(FALSE);
+    ChangeFont(false);
 
     wxSize actualSize(size);
     // work around the cases where the bitmap is a wxNull(Icon/Bitmap)
@@ -135,7 +129,7 @@ void wxStaticBitmap::DoSetBitmap()
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
-    }    
+    }
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
@@ -160,4 +154,3 @@ void wxStaticBitmap::ChangeForegroundColour()
     m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }
-