IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#endif
-#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
+#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
// Buttons
SetValidator(validator);
parent->AddChild((wxButton *)this);
- m_backgroundColour = parent->GetDefaultBackgroundColour() ;
- m_foregroundColour = parent->GetDefaultForegroundColour() ;
+ m_backgroundColour = parent->GetBackgroundColour() ;
+ m_foregroundColour = parent->GetForegroundColour() ;
m_windowStyle = (long&)style;
actualHeight = hh;
else if (height == -1)
{
- actualHeight = (int)(cyf*BUTTON_HEIGHT_FACTOR) ;
+ actualHeight = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cyf);
}
MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);