Menu
▾
▴
[htoolkit-cvs] port/src/cbits/Win32 Button.c,1.5,1.6 CheckBox.c,1.6,1.7 EditBox.c,1.8,1.9 Internals.h,1.8,1.9 Label.c,1.6,1.7 ListBox.c,1.5,1.6 PopUp.c,1.4,1.5 RadioBox.c,1.7,1.8 Window.c,1.43,1.44
Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv4408/port/src/cbits/Win32
Modified Files:
Button.c CheckBox.c EditBox.c Internals.h Label.c ListBox.c
PopUp.c RadioBox.c Window.c
Log Message:
Rename WindowReLayout to ContainerReLayout
Index: Button.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Button.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Button.c 24 Aug 2003 20:42:54 -0000 1.5
--- Button.c 24 Aug 2003 21:07:48 -0000 1.6
***************
*** 51,55 ****
{
SetWindowText(button, txt);
! osForceWindowReLayout(button);
};
--- 51,55 ----
{
SetWindowText(button, txt);
! osForceContainerReLayout(button);
};
***************
*** 57,60 ****
{
SendMessage(button, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! osForceWindowReLayout(button);
};
--- 57,60 ----
{
SendMessage(button, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! osForceContainerReLayout(button);
};
Index: CheckBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/CheckBox.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CheckBox.c 24 Aug 2003 20:42:54 -0000 1.6
--- CheckBox.c 24 Aug 2003 21:07:48 -0000 1.7
***************
*** 55,59 ****
{
SetWindowText(checkbox, txt);
! osForceWindowReLayout(checkbox);
};
--- 55,59 ----
{
SetWindowText(checkbox, txt);
! osForceContainerReLayout(checkbox);
};
Index: EditBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/EditBox.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EditBox.c 24 Aug 2003 20:42:54 -0000 1.8
--- EditBox.c 24 Aug 2003 21:07:48 -0000 1.9
***************
*** 89,92 ****
{
SendMessage(editbox, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! osForceWindowReLayout(editbox);
};
--- 89,92 ----
{
SendMessage(editbox, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! osForceContainerReLayout(editbox);
};
Index: Internals.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Internals.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Internals.h 24 Aug 2003 20:42:54 -0000 1.8
--- Internals.h 24 Aug 2003 21:07:48 -0000 1.9
***************
*** 75,79 ****
extern void *rmalloc(unsigned long bytes);
! void osForceWindowReLayout(HWND hCtrl);
#endif
--- 75,79 ----
extern void *rmalloc(unsigned long bytes);
! void osForceContainerReLayout(HWND hCtrl);
#endif
Index: Label.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Label.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Label.c 24 Aug 2003 20:42:54 -0000 1.6
--- Label.c 24 Aug 2003 21:07:48 -0000 1.7
***************
*** 51,57 ****
{
SetWindowText(label, txt);
! handleWindowReLayout(GetParent(label));
! osForceWindowReLayout(label);
!
};
--- 51,55 ----
{
SetWindowText(label, txt);
! osForceContainerReLayout(label);
};
***************
*** 59,62 ****
{
SendMessage(label, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! osForceWindowReLayout(label);
};
--- 57,60 ----
{
SendMessage(label, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! osForceContainerReLayout(label);
};
Index: ListBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/ListBox.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ListBox.c 24 Aug 2003 20:42:54 -0000 1.5
--- ListBox.c 24 Aug 2003 21:07:48 -0000 1.6
***************
*** 24,28 ****
{
SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM) title);
! osForceWindowReLayout(listbox);
};
--- 24,28 ----
{
SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM) title);
! osForceContainerReLayout(listbox);
};
***************
*** 30,34 ****
{
SendMessage(listbox, LB_INSERTSTRING, index, (LPARAM) title);
! osForceWindowReLayout(listbox);
};
--- 30,34 ----
{
SendMessage(listbox, LB_INSERTSTRING, index, (LPARAM) title);
! osForceContainerReLayout(listbox);
};
***************
*** 36,40 ****
{
SendMessage(listbox, LB_DELETESTRING, index, 0);
! osForceWindowReLayout(listbox);
};
--- 36,40 ----
{
SendMessage(listbox, LB_DELETESTRING, index, 0);
! osForceContainerReLayout(listbox);
};
***************
*** 42,46 ****
{
SendMessage(listbox, LB_RESETCONTENT,0,0);
! osForceWindowReLayout(listbox);
};
--- 42,46 ----
{
SendMessage(listbox, LB_RESETCONTENT,0,0);
! osForceContainerReLayout(listbox);
};
Index: PopUp.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/PopUp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PopUp.c 24 Aug 2003 20:42:54 -0000 1.4
--- PopUp.c 24 Aug 2003 21:07:48 -0000 1.5
***************
*** 23,27 ****
{
SendMessage(popup, CB_ADDSTRING, 0, (LPARAM) title);
! osForceWindowReLayout(popup);
};
--- 23,27 ----
{
SendMessage(popup, CB_ADDSTRING, 0, (LPARAM) title);
! osForceContainerReLayout(popup);
};
***************
*** 29,33 ****
{
SendMessage(popup, CB_INSERTSTRING, index, (LPARAM) title);
! osForceWindowReLayout(popup);
};
--- 29,33 ----
{
SendMessage(popup, CB_INSERTSTRING, index, (LPARAM) title);
! osForceContainerReLayout(popup);
};
***************
*** 35,39 ****
{
SendMessage(popup, CB_DELETESTRING, index, 0);
! osForceWindowReLayout(popup);
};
--- 35,39 ----
{
SendMessage(popup, CB_DELETESTRING, index, 0);
! osForceContainerReLayout(popup);
};
***************
*** 41,45 ****
{
SendMessage(popup, CB_RESETCONTENT,0,0);
! osForceWindowReLayout(popup);
};
--- 41,45 ----
{
SendMessage(popup, CB_RESETCONTENT,0,0);
! osForceContainerReLayout(popup);
};
Index: RadioBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/RadioBox.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RadioBox.c 24 Aug 2003 20:42:54 -0000 1.7
--- RadioBox.c 24 Aug 2003 21:07:48 -0000 1.8
***************
*** 56,60 ****
{
SetWindowText(radiobox, txt);
! osForceWindowReLayout(radiobox);
};
--- 56,60 ----
{
SetWindowText(radiobox, txt);
! osForceContainerReLayout(radiobox);
};
Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Window.c 24 Aug 2003 20:42:54 -0000 1.43
--- Window.c 24 Aug 2003 21:07:48 -0000 1.44
***************
*** 275,279 ****
GetClientRect(hWnd,&rect);
handleWindowResize(hWnd,rect.right-rect.left,rect.bottom-rect.top);
! handleWindowReLayout(hWnd);
}
break;
--- 275,279 ----
GetClientRect(hWnd,&rect);
handleWindowResize(hWnd,rect.right-rect.left,rect.bottom-rect.top);
! handleContainerReLayout(hWnd);
}
break;
***************
*** 1330,1338 ****
GetClientRect(hwnd,&rc);
handleWindowResize(hwnd,rc.right-rc.left,rc.bottom-rc.top);
! handleWindowReLayout(hwnd);
}
}
! void osForceWindowReLayout(HWND hCtrl)
{
char buffer[20];
--- 1330,1338 ----
GetClientRect(hwnd,&rc);
handleWindowResize(hwnd,rc.right-rc.left,rc.bottom-rc.top);
! handleContainerReLayout(hwnd);
}
}
! void osForceContainerReLayout(HWND hCtrl)
{
char buffer[20];
***************
*** 1346,1350 ****
_stricmp(buffer, "HNOTEBOOKPAGE") != 0)
{
! handleWindowReLayout(hWnd);
break;
}
--- 1346,1350 ----
_stricmp(buffer, "HNOTEBOOKPAGE") != 0)
{
! handleContainerReLayout(hWnd);
break;
}
|
