AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Further improvements in composite controls (wxRadioBox) on PalmOS.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-02-24 10:51:11 +00:00
parent acb1070b08
commit d289329218
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/palmos/control.cpp
View File

@ -123,7 +123,14 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
w = size.x == wxDefaultCoord ? 1 : size.x,
h = size.y == wxDefaultCoord ? 1 : size.y;
AdjustForParentClientOrigin(x, y);
wxWindow *win = this;
while(win->GetParent())
{
win = win->GetParent();
wxPoint pt(win->GetClientAreaOrigin());
x += pt.x;
y += pt.y;
}
ControlType *control = CtlNewControl(
(void **)&form,
@ -299,18 +306,23 @@ void wxControl::DoSetBounds( RectangleType &rect )
void wxControl::DoGetPosition( int *x, int *y ) const
{
int ox = 0, oy = 0;
AdjustForParentClientOrigin(ox, oy);
RectangleType rect;
DoGetBounds(rect);
if(x)
*x = rect.topLeft.x;
*x = rect.topLeft.x - ox;
if(y)
*y = rect.topLeft.y;
*y = rect.topLeft.y - oy;
}
void wxControl::DoGetSize( int *width, int *height ) const
{
RectangleType rect;
DoGetBounds(rect);
if(width)
*width = rect.extent.x;
if(height)

4
src/palmos/radiobox.cpp
View File

@ -254,6 +254,8 @@ void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
{
wxRect oldRect = GetRect();
m_pos.x = x;
m_pos.y = y;
m_size.x = width;
m_size.y = height;
@ -292,7 +294,7 @@ void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
// get the origin of the client area in the client coordinates
wxPoint wxRadioBox::GetClientAreaOrigin() const
{
return GetParent()->GetClientAreaOrigin() + GetPosition();
return GetPosition();
}
void wxRadioBox::SetString(int item, const wxString& label)

12
src/palmos/window.cpp
View File

@ -448,10 +448,10 @@ void wxWindowPalm::Refresh(bool eraseBack, const wxRect *rect)
if(rect)
{
RectangleType dirtyRect;
dirtyRect.topLeft.x = rect->GetX();
dirtyRect.topLeft.y = rect->GetY();
dirtyRect.extent.x = rect->GetWidth();
dirtyRect.extent.y = rect->GetHeight();
dirtyRect.topLeft.x = rect->GetX() - 1;
dirtyRect.topLeft.y = rect->GetY() - 1;
dirtyRect.extent.x = rect->GetWidth() + 1;
dirtyRect.extent.y = rect->GetHeight() + 1;
WinInvalidateRect(handle, &dirtyRect);
}
else
@ -510,6 +510,10 @@ void wxWindowPalm::DoGetClientSize(int *x, int *y) const
void wxWindowPalm::DoGetPosition(int *x, int *y) const
{
if(x)
*x = 0;
if(y)
*y = 0;
}
void wxWindowPalm::DoScreenToClient(int *x, int *y) const