Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wxSYSTEM_MENU on Unix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-02-26 19:28:23 +00:00
parent 4cccdfae2e
commit 49d884109c
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/changes.txt
View File

@@ -176,18 +176,16 @@ OTHER CHANGES
All:
- fixed wxLANGUAGE_CHINESE_TAIWAN to use zh_TW catalogs
- added missing wx/quantize.h to install
Unix (GUI):
- fixed the "close" button of dialogs under KDE 3.1
wxBase
- compilation with wxUSE_ODBC=1 fixed (dbkeyg.h file was missing in the archive)
2.4.0.2
-------
All:
- added missing wx/quantize.h to install
wxGTK:
- added wxEVT_MENU_OPEN event generation
@@ -228,10 +226,12 @@ Unix (Base/GUI):
- shared library symbols are now versioned on platforms that support it (Linux)
wxGTK:
- Further work for GTK 2.0 and Unicode support.
- Addition of native frame site grip.
wxX11:
- Unicode support through Pango library.
wxMSW:

5
src/gtk/toplevel.cpp
View File

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

5
src/gtk1/toplevel.cpp
View File

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

13
src/x11/toplevel.cpp
View File

@@ -668,8 +668,8 @@ bool wxSetWMDecorations(Window w, long style)
#if wxUSE_NANOX
GR_WM_PROPERTIES wmProp;
wmProp.flags = 0;
wmProp.props = 0;
wmProp.props = GR_WM_PROPS_CLOSEBOX ;
wmProp.flags = GR_WM_FLAGS_PROPS ;
if (style & wxRESIZE_BORDER)
{
@@ -677,12 +677,6 @@ bool wxSetWMDecorations(Window w, long style)
wmProp.flags |= GR_WM_FLAGS_PROPS ;
}
if (style & wxSYSTEM_MENU)
{
wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
wmProp.flags |= GR_WM_FLAGS_PROPS ;
}
if ((style & wxCAPTION) ||
(style & wxTINY_CAPTION_HORIZ) ||
(style & wxTINY_CAPTION_VERT))
@@ -745,14 +739,13 @@ bool wxSetWMDecorations(Window w, long style)
else
{
hints.decorations = MWM_DECOR_BORDER;
hints.functions = MWM_FUNC_MOVE;
hints.functions = MWM_FUNC_MOVE | MWM_FUNC_CLOSE;
if ((style & wxCAPTION) != 0)
hints.decorations |= MWM_DECOR_TITLE;
if ((style & wxSYSTEM_MENU) != 0)
{
hints.functions |= MWM_FUNC_CLOSE;
hints.decorations |= MWM_DECOR_MENU;
}