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

added wxCLOSE and fixed wxSYSTEM_MENU on Unix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-02-26 19:24:19 +00:00
parent f1a19f1478
commit c3d8ee42db
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -13,6 +13,7 @@ OTHER CHANGES
All: All:
- added wxCLOSE style for dialogs and frames
- added wxDateSpan::operator==() and !=() (Lukasz Michalski) - added wxDateSpan::operator==() and !=() (Lukasz Michalski)
- use true/false throughout the library instead of TRUE/FALSE - use true/false throughout the library instead of TRUE/FALSE
- wxStopWatch::Start() resumes the stop watch if paused, as per the docs - wxStopWatch::Start() resumes the stop watch if paused, as per the docs

7
src/gtk/toplevel.cpp
View File

@ -456,10 +456,15 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
// All this is for Motif Window Manager "hints" and is supposed to be // All this is for Motif Window Manager "hints" and is supposed to be
// recognized by other WMs as well. // recognized by other WMs as well.
if ((style & wxCAPTION) != 0) if ((style & wxCAPTION) != 0)
{
m_gdkDecor |= GDK_DECOR_TITLE; m_gdkDecor |= GDK_DECOR_TITLE;
if ((style & wxSYSTEM_MENU) != 0) }
if ((style & wxCLOSE) != 0)
{ {
m_gdkFunc |= GDK_FUNC_CLOSE; m_gdkFunc |= GDK_FUNC_CLOSE;
}
if ((style & wxSYSTEM_MENU) != 0)
{
m_gdkDecor |= GDK_DECOR_MENU; m_gdkDecor |= GDK_DECOR_MENU;
} }
if ((style & wxMINIMIZE_BOX) != 0) if ((style & wxMINIMIZE_BOX) != 0)

7
src/gtk1/toplevel.cpp
View File

@ -456,10 +456,15 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
// All this is for Motif Window Manager "hints" and is supposed to be // All this is for Motif Window Manager "hints" and is supposed to be
// recognized by other WMs as well. // recognized by other WMs as well.
if ((style & wxCAPTION) != 0) if ((style & wxCAPTION) != 0)
{
m_gdkDecor |= GDK_DECOR_TITLE; m_gdkDecor |= GDK_DECOR_TITLE;
if ((style & wxSYSTEM_MENU) != 0) }
if ((style & wxCLOSE) != 0)
{ {
m_gdkFunc |= GDK_FUNC_CLOSE; m_gdkFunc |= GDK_FUNC_CLOSE;
}
if ((style & wxSYSTEM_MENU) != 0)
{
m_gdkDecor |= GDK_DECOR_MENU; m_gdkDecor |= GDK_DECOR_MENU;
} }
if ((style & wxMINIMIZE_BOX) != 0) if ((style & wxMINIMIZE_BOX) != 0)

8
src/x11/toplevel.cpp
View File

@ -677,7 +677,7 @@ bool wxSetWMDecorations(Window w, long style)
wmProp.flags |= GR_WM_FLAGS_PROPS ; wmProp.flags |= GR_WM_FLAGS_PROPS ;
} }
if (style & wxSYSTEM_MENU) if (style & wxCLOSE)
{ {
wmProp.props |= GR_WM_PROPS_CLOSEBOX ; wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
wmProp.flags |= GR_WM_FLAGS_PROPS ; wmProp.flags |= GR_WM_FLAGS_PROPS ;
@ -751,10 +751,10 @@ bool wxSetWMDecorations(Window w, long style)
hints.decorations |= MWM_DECOR_TITLE; hints.decorations |= MWM_DECOR_TITLE;
if ((style & wxSYSTEM_MENU) != 0) if ((style & wxSYSTEM_MENU) != 0)
{
hints.functions |= MWM_FUNC_CLOSE;
hints.decorations |= MWM_DECOR_MENU; hints.decorations |= MWM_DECOR_MENU;
}
if ((style & wxCLOSE) != 0)
hints.functions |= MWM_FUNC_CLOSE;
if ((style & wxMINIMIZE_BOX) != 0) if ((style & wxMINIMIZE_BOX) != 0)
{ {