cleanup - reformatting

[wxWidgets.git] / contrib / src / fl / newbmpbtn.cpp

diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp
index b811e40c124e5e6e4f8b49fb63c7b9c137c5c8d8..eb83eb9c6219ec78b54cb8da09cc5312c16b585c 100644 (file)
--- a/contrib/src/fl/newbmpbtn.cpp
+++ b/contrib/src/fl/newbmpbtn.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "newbmpbtn.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -27,6 +23,10 @@
 #include "wx/fl/newbmpbtn.h"
 #include "wx/utils.h"     // import wxMin,wxMax macros
 
 #include "wx/fl/newbmpbtn.h"
 #include "wx/utils.h"     // import wxMin,wxMax macros
 

+#ifdef __WXMSW__
+#include "wx/msw/private.h"
+#endif
+

 ///////////// button-label rendering helpers //////////////////
 
 static int* create_array( int width, int height, int fill = 0 )
 ///////////// button-label rendering helpers //////////////////
 
 static int* create_array( int width, int height, int fill = 0 )


@@ -47,14 +47,14 @@ static int* create_array( int width, int height, int fill = 0 )
 
 #define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 )
 
 
 #define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 )
 

-#define GET_RED(col)    col        & 0xFF  
-#define GET_GREEN(col) (col >> 8)  & 0xFF     
-#define GET_BLUE(col)  (col >> 16) & 0xFF 
+#define GET_RED(col)    col        & 0xFF
+#define GET_GREEN(col) (col >> 8)  & 0xFF
+#define GET_BLUE(col)  (col >> 16) & 0xFF

 
 #define MAKE_INT_COLOR(red,green,blue) (     (red)                      | \
                                          ( ( (green) << 8 ) & 0xFF00  ) | \
                                          ( ( (blue)  << 16) & 0xFF0000) \
 
 #define MAKE_INT_COLOR(red,green,blue) (     (red)                      | \
                                          ( ( (green) << 8 ) & 0xFF00  ) | \
                                          ( ( (blue)  << 16) & 0xFF0000) \

-                                       )   
+                                       )

 
 #define IS_GREATER(col1,col2) ( ( (GET_RED(col1)  ) > (GET_RED(col2)  ) + MIN_COLOR_DIFF ) && \
                                 ( (GET_GREEN(col1)) > (GET_GREEN(col2)) + MIN_COLOR_DIFF ) &&  \
 
 #define IS_GREATER(col1,col2) ( ( (GET_RED(col1)  ) > (GET_RED(col2)  ) + MIN_COLOR_DIFF ) && \
                                 ( (GET_GREEN(col1)) > (GET_GREEN(col2)) + MIN_COLOR_DIFF ) &&  \


@@ -97,7 +97,7 @@ static void gray_out_pixmap( int* src, int* dest, int width, int height )
             else
             {
                 if ( GET_ELEM(dest,x-1,y-1) == MASK_LIGHT )
             else
             {
                 if ( GET_ELEM(dest,x-1,y-1) == MASK_LIGHT )

-                    
+

                     GET_ELEM(dest,x,y) = MASK_BG;
 
                 if ( GET_ELEM(dest,x-1,y-1 ) == MASK_DARK )
                     GET_ELEM(dest,x,y) = MASK_BG;
 
                 if ( GET_ELEM(dest,x-1,y-1 ) == MASK_DARK )


@@ -110,14 +110,14 @@ static void gray_out_pixmap( int* src, int* dest, int width, int height )
 
         // go zig-zag
 
 
         // go zig-zag
 

-        if ( IS_IN_ARRAY(x+1,y-1) ) 
+        if ( IS_IN_ARRAY(x+1,y-1) )

         {
             ++x;
             --y;
         }
         else
         {
         {
             ++x;
             --y;
         }
         else
         {

-            while ( IS_IN_ARRAY(x-1,y+1) ) 
+            while ( IS_IN_ARRAY(x-1,y+1) )

             {
                 --x;
                 ++y;
             {
                 --x;
                 ++y;


@@ -179,13 +179,13 @@ void gray_out_image_on_dc( wxDC& dc, int width, int height )
 
             switch (mask)
             {
 
             switch (mask)
             {

-                case MASK_BG    : { dc.SetPen( bgPen ); 
+                case MASK_BG    : { dc.SetPen( bgPen );

                                     dc.DrawPoint( x,y ); break;
                                   }
                                     dc.DrawPoint( x,y ); break;
                                   }

-                case MASK_DARK  : { dc.SetPen( darkPen ); 
+                case MASK_DARK  : { dc.SetPen( darkPen );

                                     dc.DrawPoint( x,y ); break;
                                   }
                                     dc.DrawPoint( x,y ); break;
                                   }

-                case MASK_LIGHT : { dc.SetPen( lightPen ); 
+                case MASK_LIGHT : { dc.SetPen( lightPen );

                                     dc.DrawPoint( x,y ); break;
                                   }
                 default : break;
                                     dc.DrawPoint( x,y ); break;
                                   }
                 default : break;


@@ -206,7 +206,8 @@ BEGIN_EVENT_TABLE( wxNewBitmapButton, wxPanel )
 
     EVT_LEFT_DOWN   ( wxNewBitmapButton::OnLButtonDown   )
     EVT_LEFT_UP     ( wxNewBitmapButton::OnLButtonUp     )
 
     EVT_LEFT_DOWN   ( wxNewBitmapButton::OnLButtonDown   )
     EVT_LEFT_UP     ( wxNewBitmapButton::OnLButtonUp     )

-    EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
+//    EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
+    EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDown )

     EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter    )
     EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave    )
 
     EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter    )
     EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave    )
 


@@ -217,13 +218,15 @@ BEGIN_EVENT_TABLE( wxNewBitmapButton, wxPanel )
 
     EVT_ERASE_BACKGROUND( wxNewBitmapButton::OnEraseBackground )
 
 
     EVT_ERASE_BACKGROUND( wxNewBitmapButton::OnEraseBackground )
 

+    EVT_IDLE(wxNewBitmapButton::OnIdle)
+

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, 
+wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,

                                       const wxString& labelText,
                                       int  alignText,
                                       bool isFlat,
                                       const wxString& labelText,
                                       int  alignText,
                                       bool isFlat,

-                                      int  firedEventType, 
+                                      int  firedEventType,

                                       int  marginX,
                                       int  marginY,
                                       int  textToLabelGap,
                                       int  marginX,
                                       int  marginY,
                                       int  textToLabelGap,


@@ -244,10 +247,11 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,
         mpFocusedImg  ( NULL ),
 
 
         mpFocusedImg  ( NULL ),
 
 

-        mDragStarted     ( FALSE ),
-        mIsPressed       ( FALSE ),
-        mIsInFocus( FALSE ),
-        mHasFocusedBmp( FALSE ),
+        mDragStarted  ( false ),
+        mIsPressed    ( false ),
+        mIsInFocus    ( false ),
+        mIsToggled    ( false ),
+        mHasFocusedBmp( false ),

         mFiredEventType( firedEventType ),
 
         mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),
         mFiredEventType( firedEventType ),
 
         mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),


@@ -255,8 +259,8 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,
         mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
         mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
 
         mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
         mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
 

-        mIsCreated( FALSE ),
-        mSizeIsSet( FALSE )
+        mIsCreated( false ),
+        mSizeIsSet( false )

 
 {
 }
 
 {
 }


@@ -266,17 +270,17 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName,
                                       const wxString& labelText,
                                       int  alignText,
                                       bool isFlat,
                                       const wxString& labelText,
                                       int  alignText,
                                       bool isFlat,

-                                      int  firedEventType, 
-                                      int  marginX,
-                                      int  marginY,
-                                      int  textToLabelGap,
-                                      bool isSticky)
+                                      int  WXUNUSED(firedEventType),
+                                      int  WXUNUSED(marginX),
+                                      int  WXUNUSED(marginY),
+                                      int  WXUNUSED(textToLabelGap),
+                                      bool WXUNUSED(isSticky))

 
     :   mTextToLabelGap  ( 2 ),
         mMarginX( 2 ),
         mMarginY( 2 ),
         mTextAlignment( alignText ),
 
     :   mTextToLabelGap  ( 2 ),
         mMarginX( 2 ),
         mMarginY( 2 ),
         mTextAlignment( alignText ),

-        mIsSticky( FALSE ),
+        mIsSticky( false ),

         mIsFlat( isFlat ),
         mLabelText( labelText ),
         mImageFileName( bitmapFileName ),
         mIsFlat( isFlat ),
         mLabelText( labelText ),
         mImageFileName( bitmapFileName ),


@@ -287,10 +291,11 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName,
         mpDisabledImg ( NULL ),
         mpFocusedImg  ( NULL ),
 
         mpDisabledImg ( NULL ),
         mpFocusedImg  ( NULL ),
 

-        mDragStarted     ( FALSE ),
-        mIsPressed       ( FALSE ),
-        mIsInFocus       ( FALSE ),
-        mHasFocusedBmp( FALSE ),
+        mDragStarted  ( false ),
+        mIsPressed    ( false ),
+        mIsInFocus    ( false ),
+        mIsToggled    ( false ),
+        mHasFocusedBmp( false ),

         mFiredEventType( wxEVT_COMMAND_MENU_SELECTED ),
 
         mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),
         mFiredEventType( wxEVT_COMMAND_MENU_SELECTED ),
 
         mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),


@@ -298,13 +303,13 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName,
         mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
         mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
 
         mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
         mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
 

-        mIsCreated( FALSE ),
-        mSizeIsSet( FALSE )
+        mIsCreated( false ),
+        mSizeIsSet( false )

 
 {
 }
 
 
 {
 }
 

-wxNewBitmapButton::~wxNewBitmapButton(void) 
+wxNewBitmapButton::~wxNewBitmapButton(void)

 {
     DestroyLabels();
 }
 {
     DestroyLabels();
 }


@@ -315,20 +320,21 @@ void wxNewBitmapButton::DrawShade( int outerLevel,
                                    wxPen& lowerRightSidePen )
 {
     wxBitmap* pBmp = GetStateLabel();
                                    wxPen& lowerRightSidePen )
 {
     wxBitmap* pBmp = GetStateLabel();

-
-    int x = mMarginX - (outerLevel + 1);
-    int y = mMarginY - (outerLevel + 1);
-
-    int height = pBmp->GetHeight() + (outerLevel + 1)*2 - 1;
-    int width  = pBmp->GetWidth()  + (outerLevel + 1)*2 - 1;
-
+    int x = mMarginX - (outerLevel + 2);
+    int y = mMarginY - (outerLevel + 2);
+    int height = pBmp->GetHeight() + (outerLevel + 2)*2 - 1;
+    int width  = pBmp->GetWidth()  + (outerLevel + 2)*2 - 1;

     dc.SetPen( upperLeftSidePen );
     dc.DrawLine( x,y, x + width, y  );
     dc.DrawLine( x,y, x, y + height );
     dc.SetPen( upperLeftSidePen );
     dc.DrawLine( x,y, x + width, y  );
     dc.DrawLine( x,y, x, y + height );

+    dc.DrawLine( x,y+1, x + width , y +1 );  // top
+    dc.DrawLine( x+1,y, x+1, y + height );  // left

 
     dc.SetPen( lowerRightSidePen );
     dc.DrawLine( x + width, y, x + width, y + height + 1  );
     dc.DrawLine( x, y + height, x + width, y + height );
 
     dc.SetPen( lowerRightSidePen );
     dc.DrawLine( x + width, y, x + width, y + height + 1  );
     dc.DrawLine( x, y + height, x + width, y + height );

+    dc.DrawLine( x + width-1, y+1, x + width-1, y + height +1  );  // right
+    dc.DrawLine( x +1, y + height-1, x + width, y + height-1 );  // bottom

 }
 
 void wxNewBitmapButton::DestroyLabels()
 }
 
 void wxNewBitmapButton::DestroyLabels()


@@ -370,11 +376,16 @@ wxBitmap* wxNewBitmapButton::GetStateLabel()
         return mpDisabledImg;
 }
 
         return mpDisabledImg;
 }
 

+#ifndef __WXMSW__
+

 static const unsigned char _gDisableImage[] = { 0x55,0xAA,0x55,0xAA,
                                               0x55,0xAA,0x55,0xAA,
                                               0x55,0xAA,0x55,0xAA,
                                               0x55,0xAA,0x55,0xAA
                                             };
 static const unsigned char _gDisableImage[] = { 0x55,0xAA,0x55,0xAA,
                                               0x55,0xAA,0x55,0xAA,
                                               0x55,0xAA,0x55,0xAA,
                                               0x55,0xAA,0x55,0xAA
                                             };

+
+#endif
+

 void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
                                           bool isEnabled, bool isPressed )
 {
 void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
                                           bool isEnabled, bool isPressed )
 {


@@ -405,7 +416,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
         {
             destDim.x = srcBmp->GetWidth() + 2*mTextToLabelGap + txtWidth;
 
         {
             destDim.x = srcBmp->GetWidth() + 2*mTextToLabelGap + txtWidth;
 

-            destDim.y = 
+            destDim.y =

                 wxMax( srcBmp->GetHeight(), txtHeight );
 
             txtPos.x = srcBmp->GetWidth() + mTextToLabelGap;
                 wxMax( srcBmp->GetHeight(), txtHeight );
 
             txtPos.x = srcBmp->GetWidth() + mTextToLabelGap;


@@ -416,7 +427,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
         else
         if ( mTextAlignment == NB_ALIGN_TEXT_BOTTOM )
         {
         else
         if ( mTextAlignment == NB_ALIGN_TEXT_BOTTOM )
         {

-            destDim.x = 
+            destDim.x =

                 wxMax( srcBmp->GetWidth(), txtWidth );
 
             destDim.y = srcBmp->GetHeight() + mTextToLabelGap + txtHeight;
                 wxMax( srcBmp->GetWidth(), txtWidth );
 
             destDim.y = srcBmp->GetHeight() + mTextToLabelGap + txtHeight;


@@ -426,9 +437,9 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
             imgPos.x = (destDim.x - srcBmp->GetWidth())/2;
             imgPos.y = 0;
         }
             imgPos.x = (destDim.x - srcBmp->GetWidth())/2;
             imgPos.y = 0;
         }

-        else 
+        else

         {
         {

-            wxFAIL_MSG("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()");
+            wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));

         }
     }
     else
         }
     }
     else


@@ -445,11 +456,9 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
     destDc.SelectObject( *destBmp );
 
     wxBrush grayBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE), wxSOLID );
     destDc.SelectObject( *destBmp );
 
     wxBrush grayBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE), wxSOLID );

-    wxPen   nullPen( wxColour(0,0,0), 1, wxTRANSPARENT );

 
     destDc.SetBrush( grayBrush );
 
     destDc.SetBrush( grayBrush );

-    destDc.SetPen( nullPen );
-
+    destDc.SetPen( *wxTRANSPARENT_PEN );

     destDc.DrawRectangle( 0,0, destDim.x+1, destDim.y+1 );
 
     if ( isPressed )
     destDc.DrawRectangle( 0,0, destDim.x+1, destDim.y+1 );
 
     if ( isPressed )


@@ -461,10 +470,10 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
     if ( hasImage )
     {
 
     if ( hasImage )
     {
 

-        destDc.Blit( imgPos.x, imgPos.y, 
-                 srcBmp->GetWidth()+1,
-                 srcBmp->GetHeight()+1,
-                 &srcDc, 0,0, wxCOPY,TRUE );
+        destDc.Blit( imgPos.x, imgPos.y,
+                 srcBmp->GetWidth(),
+                 srcBmp->GetHeight(),
+                 &srcDc, 0,0, wxCOPY,true );

     }
 
     if ( hasText )
     }
 
     if ( hasText )


@@ -497,11 +506,12 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
     }
 
     if ( !isEnabled ){
     }
 
     if ( !isEnabled ){

-    
+

 #ifdef __WXMSW__ // This is currently MSW specific
         gray_out_image_on_dc( destDc, destDim.x, destDim.y );
 #else
 #ifdef __WXMSW__ // This is currently MSW specific
         gray_out_image_on_dc( destDc, destDim.x, destDim.y );
 #else

-        wxBrush checkerBrush( wxBitmap( (const char*)_gDisableImage,8,8) );
+        wxBitmap bmp( (const char*)_gDisableImage,8,8);
+        wxBrush checkerBrush(bmp);

         checkerBrush.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
         destDc.SetBrush( checkerBrush );
         destDc.DrawRectangle( imgPos.x, imgPos.y, srcBmp->GetWidth()+1, srcBmp->GetHeight()+1);
         checkerBrush.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
         destDc.SetBrush( checkerBrush );
         destDc.DrawRectangle( imgPos.x, imgPos.y, srcBmp->GetWidth()+1, srcBmp->GetHeight()+1);


@@ -510,26 +520,33 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
     // adjust button size to fit the new dimensions of the label
     if ( !mSizeIsSet && 0 )
     {
     // adjust button size to fit the new dimensions of the label
     if ( !mSizeIsSet && 0 )
     {

-        mSizeIsSet = TRUE; 
-        SetSize( -1,-1, 
+        mSizeIsSet = true;
+        SetSize( wxDefaultCoord, wxDefaultCoord,

                  destBmp->GetWidth()  + mMarginX*2,
                  destBmp->GetWidth()  + mMarginX*2,

-                 destBmp->GetHeight() + mMarginY*2, 0 
+                 destBmp->GetHeight() + mMarginY*2, 0

             );
     }
             );
     }

+    destDc.SelectObject( wxNullBitmap );
+
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    // Map to system colours
+    (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight());
+#endif

 }
 }

+

 void wxNewBitmapButton::RenderAllLabelImages()
 {
     if ( !mIsCreated )
         return;
 void wxNewBitmapButton::RenderAllLabelImages()
 {
     if ( !mIsCreated )
         return;

-    RenderLabelImage( mpDisabledImg, &mDepressedBmp, FALSE );
-    RenderLabelImage( mpPressedImg,   &mDepressedBmp, TRUE, TRUE );
-    RenderLabelImage( mpDepressedImg, &mDepressedBmp, TRUE, FALSE );
+    RenderLabelImage( mpDisabledImg, &mDepressedBmp, false );
+    RenderLabelImage( mpPressedImg,   &mDepressedBmp, true, true );
+    RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );

     if ( mHasFocusedBmp )
     {
     if ( mHasFocusedBmp )
     {

-        RenderLabelImage( mpFocusedImg, &mFocusedBmp, TRUE, FALSE );
+        RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false );

     }
 }
     }
 }

-    
+

 
 void wxNewBitmapButton::RenderLabelImages()
 {
 
 void wxNewBitmapButton::RenderLabelImages()
 {


@@ -538,39 +555,52 @@ void wxNewBitmapButton::RenderLabelImages()
 
     if ( !IsEnabled() )
     {
 
     if ( !IsEnabled() )
     {

-        RenderLabelImage( mpDisabledImg, &mDepressedBmp, FALSE );
+        RenderLabelImage( mpDisabledImg, &mDepressedBmp, false );

     }
     else
 
     }
     else
 

-    if ( mIsPressed ) 
+    if ( mIsPressed )

 
 

-        RenderLabelImage( mpPressedImg,   &mDepressedBmp, TRUE, TRUE );
+        RenderLabelImage( mpPressedImg,   &mDepressedBmp, true, true );

     else
     {
         if ( mIsInFocus )
         {
             if ( mHasFocusedBmp )
     else
     {
         if ( mIsInFocus )
         {
             if ( mHasFocusedBmp )

-                RenderLabelImage( mpFocusedImg, &mFocusedBmp, TRUE, FALSE );
+                RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false );

             else
             else

-                RenderLabelImage( mpDepressedImg, &mDepressedBmp, TRUE, FALSE );
+                RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );

         }
         else
         }
         else

-            RenderLabelImage( mpDepressedImg, &mDepressedBmp, TRUE, FALSE );
+            RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );

     }
 }
 
     }
 }
 

+bool wxNewBitmapButton::Toggle(bool enable)
+{
+    if ( mIsToggled == enable )
+    {
+        return false;
+    }
+
+    mIsToggled = enable;
+    Refresh();
+
+    return true;
+}
+

 bool wxNewBitmapButton::Enable(bool enable)
 {
     if ( enable != m_isEnabled )
     {
         if ( mIsInFocus )
         {
 bool wxNewBitmapButton::Enable(bool enable)
 {
     if ( enable != m_isEnabled )
     {
         if ( mIsInFocus )
         {

-            mIsInFocus = FALSE;
+            mIsInFocus = false;

         }
 
         if ( mIsPressed )
         {
         }
 
         if ( mIsPressed )
         {

-            mIsPressed = FALSE;
+            mIsPressed = false;

         }
 
         Refresh();
         }
 
         Refresh();


@@ -584,8 +614,11 @@ void wxNewBitmapButton::DrawDecorations( wxDC& dc )
     if ( mIsFlat )
     {
         DrawShade( 1, dc, mGrayPen,  mGrayPen  );
     if ( mIsFlat )
     {
         DrawShade( 1, dc, mGrayPen,  mGrayPen  );

-        
-        if ( mIsInFocus )
+        if ( mIsToggled )
+        {
+            DrawShade( 0, dc, mDarkPen,  mLightPen  );
+        }
+        else if ( mIsInFocus )

         {
             if ( mIsPressed )
                 DrawShade( 0, dc, mDarkPen,  mLightPen  );
         {
             if ( mIsPressed )
                 DrawShade( 0, dc, mDarkPen,  mLightPen  );


@@ -597,7 +630,7 @@ void wxNewBitmapButton::DrawDecorations( wxDC& dc )
     }
     else
     {
     }
     else
     {

-        if ( mIsPressed )
+        if ( mIsPressed || mIsToggled )

         {
             DrawShade( 0, dc, mDarkPen,  mGrayPen  );
             DrawShade( 1, dc, mBlackPen, mLightPen );
         {
             DrawShade( 0, dc, mDarkPen,  mGrayPen  );
             DrawShade( 1, dc, mBlackPen, mLightPen );


@@ -610,7 +643,7 @@ void wxNewBitmapButton::DrawDecorations( wxDC& dc )
     }
 }
 
     }
 }
 

-void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap, 
+void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap,

                                  const wxString& labelText )
 {
     DestroyLabels();
                                  const wxString& labelText )
 {
     DestroyLabels();


@@ -640,10 +673,10 @@ void wxNewBitmapButton::SetAlignments( int alignText,
 
 // event handlers
 
 
 // event handlers
 

-void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& event )
+void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& WXUNUSED(event) )

 {
 {

-    mDragStarted      = TRUE;
-    mIsPressed        = TRUE;
+    mDragStarted      = true;
+    mIsPressed        = true;

     Refresh();
 }
 
     Refresh();
 }
 


@@ -652,31 +685,16 @@ void wxNewBitmapButton::OnLButtonUp( wxMouseEvent& event )
     if ( !mDragStarted )
         return;
 
     if ( !mDragStarted )
         return;
 

-    mDragStarted = FALSE;
-    mIsPressed   = FALSE;
+    mDragStarted = false;
+    mIsPressed   = false;

     Refresh();
 
     Refresh();
 

-    if ( IsInWindow( event.m_x, event.m_y ) ) 
-    {
-        // fire event, if mouse was released
-        // within the bounds of button
-        wxCommandEvent cmd( mFiredEventType, GetId() );
-        GetParent()->ProcessEvent( cmd );
-    }
-}
-
-void wxNewBitmapButton::OnLButtonDClick( wxMouseEvent& event )
-{
-    if ( IsInWindow( event.m_x, event.m_y ) ) 
+    if ( IsInWindow( event.m_x, event.m_y ) )

     {
         // fire event, if mouse was released
         // within the bounds of button
         wxCommandEvent cmd( mFiredEventType, GetId() );
         GetParent()->ProcessEvent( cmd );
     {
         // fire event, if mouse was released
         // within the bounds of button
         wxCommandEvent cmd( mFiredEventType, GetId() );
         GetParent()->ProcessEvent( cmd );

-
-        mDragStarted = FALSE;
-        mIsPressed   = FALSE;
-        Refresh();

     }
 }
 
     }
 }
 


@@ -690,13 +708,13 @@ bool wxNewBitmapButton::IsInWindow( int x, int y )
              y < height );
 }
 
              y < height );
 }
 

-void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& event )
+void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& WXUNUSED(event) )

 {
     bool prevIsInFocus = mIsInFocus;
 
     if ( !mIsInFocus )
     {
 {
     bool prevIsInFocus = mIsInFocus;
 
     if ( !mIsInFocus )
     {

-        mIsInFocus = TRUE;
+        mIsInFocus = true;

     }
     if ( prevIsInFocus != mIsInFocus )
     {
     }
     if ( prevIsInFocus != mIsInFocus )
     {


@@ -704,14 +722,14 @@ void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& event )
     }
 }
 
     }
 }
 

-void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& event )
+void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& WXUNUSED(event) )

 {
     bool prevIsInFocus = mIsInFocus;
     bool prevIsPressed = mIsPressed;
     if ( mIsInFocus )
     {
 {
     bool prevIsInFocus = mIsInFocus;
     bool prevIsPressed = mIsPressed;
     if ( mIsInFocus )
     {

-        mIsInFocus = FALSE;
-        mIsPressed = FALSE;
+        mIsInFocus = false;
+        mIsPressed = false;

     }
     if ( prevIsInFocus != mIsInFocus || prevIsPressed != mIsPressed )
     {
     }
     if ( prevIsInFocus != mIsInFocus || prevIsPressed != mIsPressed )
     {


@@ -719,22 +737,22 @@ void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& event )
     }
 }
 
     }
 }
 

-void wxNewBitmapButton::OnSize( wxSizeEvent& event )
+void wxNewBitmapButton::OnSize( wxSizeEvent& WXUNUSED(event) )

 {
         //Reshape();
 }
 
 void wxNewBitmapButton::Reshape( )
 {
         //Reshape();
 }
 
 void wxNewBitmapButton::Reshape( )

-{   
+{

     bool wasCreated = mIsCreated;
     bool wasCreated = mIsCreated;

-    mIsCreated = TRUE;
+    mIsCreated = true;

 
     if ( !wasCreated )
     {
         // in the case of loading button from stream, check if we
 
     if ( !wasCreated )
     {
         // in the case of loading button from stream, check if we

-        // have non-empty image-file name, load if possible 
+        // have non-empty image-file name, load if possible

 
 

-        if ( mImageFileName != "" )
+        if (!mImageFileName.empty())

         {
             mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
 
         {
             mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
 


@@ -769,16 +787,16 @@ void wxNewBitmapButton::DrawLabel( wxDC& dc )
     wxMemoryDC mdc;
     mdc.SelectObject( *pCurBmp );
 
     wxMemoryDC mdc;
     mdc.SelectObject( *pCurBmp );
 

-    dc.Blit( mMarginX, mMarginY, 
+    dc.Blit( mMarginX, mMarginY,

              pCurBmp->GetWidth(),
              pCurBmp->GetHeight(),
              pCurBmp->GetWidth(),
              pCurBmp->GetHeight(),

-             &mdc, 0,0, wxCOPY 
+             &mdc, 0,0, wxCOPY

            );
 
     mdc.SelectObject( wxNullBitmap );
 }
 
            );
 
     mdc.SelectObject( wxNullBitmap );
 }
 

-void wxNewBitmapButton::OnPaint( wxPaintEvent& event )
+void wxNewBitmapButton::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 


@@ -790,15 +808,44 @@ void wxNewBitmapButton::OnPaint( wxPaintEvent& event )
     DrawDecorations( dc );
 }
 
     DrawDecorations( dc );
 }
 

-void wxNewBitmapButton::OnEraseBackground( wxEraseEvent& event )
+void wxNewBitmapButton::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )

 {
     // do nothing
 }
 
 {
     // do nothing
 }
 

-void wxNewBitmapButton::OnKillFocus( wxFocusEvent& event )
+void wxNewBitmapButton::OnKillFocus( wxFocusEvent& WXUNUSED(event) )

 {
     // useless
 
 {
     // useless
 

-    wxMessageBox("kill-focus for button!");
+    wxMessageBox(wxT("kill-focus for button!"));
+}
+
+// ----------------------------------------------------------------------------
+// UI updates
+// ----------------------------------------------------------------------------
+
+void wxNewBitmapButton::OnIdle(wxIdleEvent& event)
+{
+    DoButtonUpdate();
+
+    event.Skip();

 }
 
 }
 

+// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
+void wxNewBitmapButton::DoButtonUpdate()
+{
+    wxUpdateUIEvent event(GetId());
+    event.SetEventObject(this);
+
+    if ( GetParent()->ProcessEvent(event) )
+    {
+        if ( event.GetSetEnabled() )
+        {
+            bool enabled = event.GetEnabled();
+            if ( enabled != IsEnabled() )
+                Enable( enabled );
+        }
+        if ( event.GetSetChecked() )
+            Toggle( event.GetChecked() );
+    }
+}