Fixups for solaris; remove '-mt' from pkg-config output and add '-lX11' for a static...

[wxWidgets.git] / contrib / include / wx / gizmos / statpict.h

diff --git a/contrib/include/wx/gizmos/statpict.h b/contrib/include/wx/gizmos/statpict.h
index a9ce912a264c006e7f110c700a9fe39463c5cf3f..fd8633dbe6262f18a001c5646624fcd8ecfe70ab 100644 (file)
--- a/contrib/include/wx/gizmos/statpict.h
+++ b/contrib/include/wx/gizmos/statpict.h
@@ -12,16 +12,14 @@
 #ifndef _WX_STATPICT_H_
 #define _WX_STATPICT_H_
 
 #ifndef _WX_STATPICT_H_
 #define _WX_STATPICT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "statpict.h"
-#endif
-

 #include "wx/control.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"
 
 #include "wx/control.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"
 

+#include "wx/gizmos/gizmos.h"
+

 enum
 {
     wxSCALE_HORIZONTAL = 0x1,
 enum
 {
     wxSCALE_HORIZONTAL = 0x1,


@@ -30,10 +28,9 @@ enum
     wxSCALE_CUSTOM     = 0x8
 };
 
     wxSCALE_CUSTOM     = 0x8
 };
 

-//WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
-extern const wxChar* wxStaticPictureNameStr;
+WXDLLIMPEXP_GIZMOS extern const wxChar* wxStaticPictureNameStr;

 
 

-class /*WXDLLEXPORT*/ wxStaticPicture : public wxControl
+class WXDLLIMPEXP_GIZMOS wxStaticPicture : public wxControl

 {
     DECLARE_DYNAMIC_CLASS(wxStaticPicture)
 
 {
     DECLARE_DYNAMIC_CLASS(wxStaticPicture)
 


@@ -57,8 +54,8 @@ public:
         long style = 0,
         const wxString& name = wxStaticPictureNameStr );
 
         long style = 0,
         const wxString& name = wxStaticPictureNameStr );
 

-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
+    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event)) {return true;}

     void OnPaint(wxPaintEvent& event);
 
     void SetBitmap( const wxBitmap& bmp );
     void OnPaint(wxPaintEvent& event);
 
     void SetBitmap( const wxBitmap& bmp );