redefined TRUE and FALSE to be of type bool

[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 609923f41797dc6fe2dec5a1427e007af6170014..fac871be7308a233a6c4520a67ff861b5686a5c7 100644 (file)
--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -19,6 +19,9 @@
 #include "wx/button.h"
 #include "wx/string.h"
 
 #include "wx/button.h"
 #include "wx/string.h"
 

+// defaults
+#define NB_DEFAULT_MARGIN 2
+

 // button label-text alignment types
 
 #define NB_ALIGN_TEXT_RIGHT  0
 // button label-text alignment types
 
 #define NB_ALIGN_TEXT_RIGHT  0


@@ -70,8 +73,6 @@ protected:
     bool      mDragStarted;
     bool      mIsPressed;
     bool      mIsInFocus;
     bool      mDragStarted;
     bool      mIsPressed;
     bool      mIsInFocus;

-    bool      mPrevPressedState;
-    bool      mPrevInFocusState;

 
     bool      mHasFocusedBmp;
 
 
     bool      mHasFocusedBmp;
 


@@ -113,8 +114,8 @@ public:
                        bool  isFlat                = TRUE,
                        // this is the default type of fired events
                        int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                        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
                      );


@@ -127,8 +128,8 @@ public:
                            bool  isFlat                   = TRUE,
                            // this is the default type of fired events
                            int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                            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
                              );


@@ -145,8 +146,8 @@ public:
 
         // 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.


@@ -166,14 +167,23 @@ public:
         // Renders label images.
     virtual void RenderAllLabelImages();
 
         // Renders label images.
     virtual void RenderAllLabelImages();
 

+        // Enables/disables button
+    virtual bool Enable(bool enable);
+

         // Responds to a left mouse button down event.
     void OnLButtonDown( wxMouseEvent& event );
 
         // Responds to a left mouse button up event.
     void OnLButtonUp( wxMouseEvent& event );
 
         // Responds to a left mouse button down event.
     void OnLButtonDown( wxMouseEvent& event );
 
         // Responds to a left mouse button up event.
     void OnLButtonUp( wxMouseEvent& event );
 

-        // Responds to a mouse move event.
-    void OnMouseMove( 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 leave from window.
+    void OnMouseLeave( wxMouseEvent& event );

 
         // Responds to a size event.
     void OnSize( wxSizeEvent& event );
 
         // Responds to a size event.
     void OnSize( wxSizeEvent& event );


@@ -187,6 +197,11 @@ public:
         // Responds to a kill focus event.
     void OnKillFocus( wxFocusEvent& event );
 
         // Responds to a kill focus event.
     void OnKillFocus( wxFocusEvent& event );
 

+        // Maps bitmap to current system colours on Windows
+#ifdef __WXMSW__
+    WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
+#endif
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };