moving tlw list up, cleanup

[wxWidgets.git] / include / wx / mac / carbon / statbmp.h

diff --git a/include/wx/mac/carbon/statbmp.h b/include/wx/mac/carbon/statbmp.h
index 8a16726c572e938905e0b3360e829e626351be68..4841947522635ab26edbf377b1a776de826bcde5 100644 (file)
--- a/include/wx/mac/carbon/statbmp.h
+++ b/include/wx/mac/carbon/statbmp.h
@@ -12,19 +12,15 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "statbmp.h"
-#endif
-

 #include "wx/icon.h"
 
 class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
  public:
 #include "wx/icon.h"
 
 class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
  public:

-  inline wxStaticBitmap() { }
+  wxStaticBitmap() { }

 
 

-  inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
+  wxStaticBitmap(wxWindow *parent, wxWindowID id,

            const wxBitmap& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxBitmap& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -57,10 +53,11 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }

-  virtual  wxSize DoGetBestSize() const ;

 
  protected:
 
  protected:

-  wxBitmap m_bitmap;
+    virtual wxSize DoGetBestSize() const;
+
+    wxBitmap m_bitmap;

     DECLARE_EVENT_TABLE() 
 };
 
     DECLARE_EVENT_TABLE() 
 };