Fixes to allow OGL building as a DLL

[wxWidgets.git] / contrib / include / wx / fl / newbmpbtn.h

diff --git a/contrib/include/wx/fl/newbmpbtn.h b/contrib/include/wx/fl/newbmpbtn.h
index 455b54aad5c15dc2ec30a3b92641be20747d2876..49a00018107fe89cfa927ee4ce924bc960e42d1b 100644 (file)
--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -12,12 +12,16 @@
 #ifndef __NEWBMPBTN_G__
 #define __NEWBMPBTN_G__
 
 #ifndef __NEWBMPBTN_G__
 #define __NEWBMPBTN_G__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "newbmpbtn.h"
 #endif
 
 #include "wx/button.h"
 #include "wx/string.h"
     #pragma interface "newbmpbtn.h"
 #endif
 
 #include "wx/button.h"
 #include "wx/string.h"

+#include "wx/fl/fldefs.h"
+
+// defaults
+#define NB_DEFAULT_MARGIN 2

 
 // button label-text alignment types
 
 
 // button label-text alignment types
 


@@ -28,8 +32,8 @@
 
 // classes declared in this header file
 
 
 // classes declared in this header file
 

-class wxNewBitmapButton;
-class wxBorderLessBitmapButton;
+class WXDLLIMPEXP_FL wxNewBitmapButton;
+class WXDLLIMPEXP_FL wxBorderLessBitmapButton;

 
 /*
 This is an alternative class to wxBitmapButton. It is used
 
 /*
 This is an alternative class to wxBitmapButton. It is used


@@ -106,13 +110,13 @@ public:
 
         // Constructor.
     wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
 
         // Constructor.
     wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,

-                       const wxString& labelText   = "",
+                       const wxString& labelText   = wxT(""),

                        int   alignText             = NB_ALIGN_TEXT_BOTTOM,
                        bool  isFlat                = TRUE,
                        // this is the default type of fired events
                        int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                        int   alignText             = NB_ALIGN_TEXT_BOTTOM,
                        bool  isFlat                = TRUE,
                        // this is the default type of fired events
                        int firedEventType = wxEVT_COMMAND_MENU_SELECTED,

-                       int marginX        = 2,
-                       int marginY        = 2,
+                       int marginX        = NB_DEFAULT_MARGIN,
+                       int marginY        = NB_DEFAULT_MARGIN,

                        int textToLabelGap = 2,
                        bool isSticky      = FALSE
                      );
                        int textToLabelGap = 2,
                        bool isSticky      = FALSE
                      );


@@ -120,13 +124,13 @@ public:
         // Use this constructor if buttons have to be persistant
     wxNewBitmapButton( const wxString& bitmapFileName,
                            const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
         // Use this constructor if buttons have to be persistant
     wxNewBitmapButton( const wxString& bitmapFileName,
                            const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,

-                           const wxString& labelText      = "",
+                           const wxString& labelText      = wxT(""),

                            int alignText                  = NB_ALIGN_TEXT_BOTTOM,
                            bool  isFlat                   = TRUE,
                            // this is the default type of fired events
                            int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                            int alignText                  = NB_ALIGN_TEXT_BOTTOM,
                            bool  isFlat                   = TRUE,
                            // this is the default type of fired events
                            int firedEventType = wxEVT_COMMAND_MENU_SELECTED,

-                           int marginX        = 2,
-                           int marginY        = 2,
+                           int marginX        = NB_DEFAULT_MARGIN,
+                           int marginY        = NB_DEFAULT_MARGIN,

                            int textToLabelGap = 2,
                            bool isSticky      = FALSE
                              );
                            int textToLabelGap = 2,
                            bool isSticky      = FALSE
                              );


@@ -139,12 +143,12 @@ public:
     virtual void Reshape();
 
         // Sets the label and optionally label text.
     virtual void Reshape();
 
         // Sets the label and optionally label text.

-    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );
+    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );

 
         // Sets the text alignment and margins.
     virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
 
         // Sets the text alignment and margins.
     virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,

-                                int marginX        = 2,
-                                int marginY        = 2,
+                                int marginX        = NB_DEFAULT_MARGIN,
+                                int marginY        = NB_DEFAULT_MARGIN,

                                 int textToLabelGap = 2);
 
         // Draws the decorations.
                                 int textToLabelGap = 2);
 
         // Draws the decorations.


@@ -173,9 +177,6 @@ public:
         // Responds to a left mouse button up event.
     void OnLButtonUp( wxMouseEvent& event );
 
         // Responds to a left mouse button up event.
     void OnLButtonUp( wxMouseEvent& event );
 

-        // Responds to a left mouse button double click.
-    void OnLButtonDClick( wxMouseEvent& event );
-

         // Responds to mouse enter to window.
     void OnMouseEnter( wxMouseEvent& event );
 
         // Responds to mouse enter to window.
     void OnMouseEnter( wxMouseEvent& event );