ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 04:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix a bug freeing memory for floating windows.

Browse Source 
- ShowHideWindow needs no more than a Window handle

svn path=/trunk/; revision=24728
This commit is contained in:
Ged Murphy
2006-11-12 20:13:39 +00:00
parent 48e98be889
commit c77ef10192
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/imagesoft/floatwindow.c
+6 -6
View File
@@ -40,12 +40,12 @@ TBBUTTON HistoryButtons[] = {
BOOL
ShowHideWindow(PFLT_WND FltInfo)
ShowHideWindow(HWND hwnd)
{
if (IsWindowVisible(FltInfo->hSelf))
return ShowWindow(FltInfo->hSelf, SW_HIDE);
if (IsWindowVisible(hwnd))
return ShowWindow(hwnd, SW_HIDE);
else
return ShowWindow(FltInfo->hSelf, SW_SHOW);
return ShowWindow(hwnd, SW_SHOW);
}
@@ -447,13 +447,13 @@ FloatToolbarWndProc(HWND hwnd,
break;
case WM_CLOSE:
ShowHideWindow(FltInfo);
ShowHideWindow(FltInfo->hSelf);
break;
case WM_COMMAND:
{
if (LOWORD(wParam) == IDCANCEL)
ShowHideWindow(FltInfo);
ShowHideWindow(FltInfo->hSelf);
switch(LOWORD(wParam))
{
reactos/base/applications/imagesoft/mainwnd.c
+10 -10
View File
@@ -378,10 +378,10 @@ MainWndToolbarDockBand(struct _TOOLBAR_DOCKS *TbDocks,
{
SIZE Size;
BOOL Vert;
DWORD dwStyle = SendMessage(rbi->hwndChild,
TB_GETSTYLE,
0,
0);
DWORD dwStyle = (DWORD)SendMessage(rbi->hwndChild,
TB_GETSTYLE,
0,
0);
switch (DockTo)
{
case LEFT_DOCK:
@@ -613,7 +613,7 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info)
ID_TOOLS,
MF_CHECKED);
ShowHideWindow(Info->fltTools);
ShowHideWindow(Info->fltTools->hSelf);
}
}
@@ -642,10 +642,10 @@ MainWndDestroyFloatWindows(PMAIN_WND_INFO Info)
HeapFree(ProcessHeap, 0, Info->fltTools);
if (Info->fltColors != NULL)
HeapFree(ProcessHeap, 0, Info->fltTools);
HeapFree(ProcessHeap, 0, Info->fltColors);
if (Info->fltHistory != NULL)
HeapFree(ProcessHeap, 0, Info->fltTools);
HeapFree(ProcessHeap, 0, Info->fltHistory);
}
@@ -893,7 +893,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
{
UINT uCheck = MF_CHECKED;
if (ShowHideWindow(Info->fltTools))
if (ShowHideWindow(Info->fltTools->hSelf))
uCheck = MF_UNCHECKED;
CheckMenuItem(hMenu,
@@ -911,7 +911,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
{
UINT uCheck = MF_CHECKED;
if (ShowHideWindow(Info->fltColors))
if (ShowHideWindow(Info->fltColors->hSelf))
uCheck = MF_UNCHECKED;
CheckMenuItem(hMenu,
@@ -929,7 +929,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
{
UINT uCheck = MF_CHECKED;
if (ShowHideWindow(Info->fltHistory))
if (ShowHideWindow(Info->fltHistory->hSelf))
uCheck = MF_UNCHECKED;
CheckMenuItem(hMenu,
reactos/base/applications/imagesoft/precomp.h
+1 -1
View File
@@ -388,7 +388,7 @@ BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info);
BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info);
BOOL InitFloatWndClass(VOID);
VOID UninitFloatWndImpl(VOID);
BOOL ShowHideWindow(PFLT_WND FltInfo);
BOOL ShowHideWindow(HWND hwnd);
/* font.c */
VOID FillFontStyleComboList(HWND hwndCombo);