don't crash when invalid colour is set as fg/bg colour

[wxWidgets.git] / utils / framelayout / src / newbmpbtn.h

diff --git a/utils/framelayout/src/newbmpbtn.h b/utils/framelayout/src/newbmpbtn.h
index df25a45752d8237a18f3ff01938dd614e35359cb..9d0c6315d0d23998d0f83183b84a858bdb1529c4 100644 (file)
--- a/utils/framelayout/src/newbmpbtn.h
+++ b/utils/framelayout/src/newbmpbtn.h
@@ -42,11 +42,11 @@ protected:
        int      mMarginY;
        int      mTextAlignment;
        bool     mIsSticky;
+       bool     mIsFlat;
 
        wxString mLabelText;
        wxString mImageFileName;
        int      mImageFileType;
-       bool     mIsFlat;
 
        wxBitmap mDepressedBmp; // source image for rendering
                                // labels for particular state
@@ -64,6 +64,7 @@ protected:
        bool      mIsPressed; 
        bool      mIsInFocus;
        bool      mPrevPressedState;
+       bool      mPrevInFocusState;
 
        bool      mHasFocusedBmp;
 
@@ -142,6 +143,7 @@ public:
                                                                   bool isPressed = FALSE);
 
        virtual void RenderLabelImages();
+       virtual void RenderAllLabelImages();
 
        // event handlers
        void OnLButtonDown( wxMouseEvent& event );