- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- int x1 = x;
- int y1 = y;
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
-
- AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
- int actualWidth = width;
- int actualHeight = height;
- int ww, hh;
- GetSize(&ww, &hh);
-
- int current_width;
- int cyf;
- char buf[300];
- GetWindowText((HWND) GetHWND(), buf, 300);
- GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL,
- & this->GetFont());
-
- // If we're prepared to use the existing width, then...
- if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
- actualWidth = ww;
- else if (width == -1)
- {
- int cx;
- int cy;
- wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
- actualWidth = (int)(current_width + 3*cx) ;
- }
-
- // If we're prepared to use the existing height, then...
- if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
- actualHeight = hh;
- else if (height == -1)
- {
- actualHeight = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cyf);
- }
-
- MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+ // the base unit is the height of the system GUI font
+ int wChar, hChar;
+ wxGetCharSize(0, &wChar, &hChar, NULL);
+
+ // the button height is proportional to the height of the font used
+ int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
+
+ // and the width/height ration is 75/23
+ return wxSize((75 * hBtn) / 23, hBtn);