X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..af8481937288aa79f67b5e7df3caeef5a7824248:/include/wx/bmpbuttn.h diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 884796042a..f0e8f7782b 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -27,7 +27,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; class WXDLLEXPORT wxBitmapButtonBase : public wxButton { public: - wxBitmapButtonBase() { m_marginX = m_marginY = 0; } + wxBitmapButtonBase() + : m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled() + , m_marginX(0), m_marginY(0) + { } // set the bitmaps void SetBitmapLabel(const wxBitmap& bitmap) @@ -85,10 +88,10 @@ private: #include "wx/gtk/bmpbuttn.h" #elif defined(__WXMAC__) #include "wx/mac/bmpbuttn.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/bmpbuttn.h" #elif defined(__WXPM__) #include "wx/os2/bmpbuttn.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/bmpbuttn.h" #endif #endif // wxUSE_BMPBUTTON