X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18f3decb46a80b38801dd6590d08eb525d3a3963..c259ffdff79ed1cb412cc829a19558064ce87474:/src/mac/classic/control.cpp diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp index 4d5f5c15ad..1599c395c5 100644 --- a/src/mac/classic/control.cpp +++ b/src/mac/classic/control.cpp @@ -16,16 +16,20 @@ #endif #include "wx/control.h" -#include "wx/panel.h" -#include "wx/app.h" -#include "wx/dc.h" -#include "wx/dcclient.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/panel.h" + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/button.h" +#endif // WX_PRECOMP + #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/radiobox.h" #include "wx/spinbutt.h" #include "wx/scrolbar.h" -#include "wx/button.h" #include "wx/dialog.h" #include "wx/statbox.h" #include "wx/sizer.h" @@ -435,13 +439,13 @@ void wxControl::MacAdjustControlRect() { if ( IsKindOf( CLASSINFO( wxButton ) ) ) { - m_width = m_label.Length() * 8 + 12 ; + m_width = m_label.length() * 8 + 12 ; if ( m_width < 70 ) m_width = 70 ; } else if ( IsKindOf( CLASSINFO( wxStaticText ) ) ) { - m_width = m_label.Length() * 8 ; + m_width = m_label.length() * 8 ; } else m_width = bestsize.right - bestsize.left ;