Let Cygwin be a Windows build for wxMSW and a unix build otherwise

[wxWidgets.git] / include / wx / univ / menuitem.h

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index 9f8e53306779dc850f8ecbdb9eaee4767094e363..4fe666fc276919c49bd1cf2a70a401db4fde0ca6 100644 (file)
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -36,8 +36,8 @@ public:
     virtual void SetText(const wxString& text);
     virtual void SetCheckable(bool checkable);
 
     virtual void SetText(const wxString& text);
     virtual void SetCheckable(bool checkable);
 

-    virtual void Enable(bool enable = TRUE);
-    virtual void Check(bool check = TRUE);
+    virtual void Enable(bool enable = true);
+    virtual void Check(bool check = true);

 
     // we add some extra functions which are also available under MSW from
     // wxOwnerDrawn class - they will be moved to wxMenuItemBase later
 
     // we add some extra functions which are also available under MSW from
     // wxOwnerDrawn class - they will be moved to wxMenuItemBase later


@@ -45,9 +45,14 @@ public:
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmp) { SetBitmaps(bmp); }
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmp) { SetBitmaps(bmp); }

-    const wxBitmap& GetBitmap(bool checked = TRUE) const
+    const wxBitmap& GetBitmap(bool checked = true) const

       { return checked ? m_bmpChecked : m_bmpUnchecked; }
 
       { return checked ? m_bmpChecked : m_bmpUnchecked; }
 

+    void SetDisabledBitmap( const wxBitmap& bmpDisabled )
+      { m_bmpDisabled = bmpDisabled; }
+    const wxBitmap& GetDisabledBitmap() const
+      { return m_bmpDisabled; }
+

     // mark item as belonging to the given radio group
     void SetAsRadioGroupStart();
     void SetRadioGroupStart(int start);
     // mark item as belonging to the given radio group
     void SetAsRadioGroupStart();
     void SetRadioGroupStart(int start);


@@ -71,14 +76,14 @@ public:
 
     wxCoord GetPosition() const
     {
 
     wxCoord GetPosition() const
     {

-        wxASSERT_MSG( m_posY != -1, _T("must call SetHeight first!") );
+        wxASSERT_MSG( m_posY != wxDefaultCoord, _T("must call SetHeight first!") );

 
         return m_posY;
     }
 
     wxCoord GetHeight() const
     {
 
         return m_posY;
     }
 
     wxCoord GetHeight() const
     {

-        wxASSERT_MSG( m_height != -1, _T("must call SetHeight first!") );
+        wxASSERT_MSG( m_height != wxDefaultCoord, _T("must call SetHeight first!") );

 
         return m_height;
     }
 
         return m_height;
     }


@@ -92,11 +97,12 @@ protected:
 
     // the bitmaps (may be invalid, then they're not used)
     wxBitmap m_bmpChecked,
 
     // the bitmaps (may be invalid, then they're not used)
     wxBitmap m_bmpChecked,

-             m_bmpUnchecked;
+             m_bmpUnchecked,
+             m_bmpDisabled; 

 
     // the positions of the first and last items of the radio group this item
     // belongs to or -1: start is the radio group start and is valid for all
 
     // the positions of the first and last items of the radio group this item
     // belongs to or -1: start is the radio group start and is valid for all

-    // but first radio group items (m_isRadioGroupStart == FALSE), end is valid
+    // but first radio group items (m_isRadioGroupStart == false), end is valid

     // only for the first one
     union
     {
     // only for the first one
     union
     {