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

Added border for top level windows with captions, though

Browse Source 
this does seem to make it resizable also. Sizing of about dialog
wrong at present.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-14 12:07:54 +00:00
parent edaf57a4da
commit 307be31a92
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/x11/toplevel.cpp
View File

@@ -111,20 +111,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
// I think we set this to True to remove decorations // I think we set this to True to remove decorations
xattributes.override_redirect = False; xattributes.override_redirect = False;
Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
m_mainWidget = (WXWindow) xwindow;
XSelectInput( xdisplay, xwindow,
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
PropertyChangeMask );
wxAddWindowToTable( xwindow, (wxWindow*) this );
XSetTransientForHint( xdisplay, xwindow, xparent );
wxSize size2(size); wxSize size2(size);
if (size2.x == -1) if (size2.x == -1)
size2.x = 100; size2.x = 100;
@@ -137,6 +123,21 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
if (pos2.y == -1) if (pos2.y == -1)
pos2.y = 100; pos2.y = 100;
Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
m_mainWidget = (WXWindow) xwindow;
XSelectInput( xdisplay, xwindow,
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
PropertyChangeMask );
wxAddWindowToTable( xwindow, (wxWindow*) this );
// Messes up window management
// XSetTransientForHint( xdisplay, xwindow, xparent );
size_hints.flags = PSize; size_hints.flags = PSize;
size_hints.width = size2.x; size_hints.width = size2.x;
size_hints.height = size2.y; size_hints.height = size2.y;
@@ -153,7 +154,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
wxSetWMDecorations((Window) GetMainWindow(), style); wxSetWMDecorations((Window) GetMainWindow(), style);
SetTitle(title); SetTitle(title);
SetSize(pos2.x, pos2.y, size2.x, size2.y);
return TRUE; return TRUE;
} }
@@ -370,7 +370,7 @@ bool wxSetWMDecorations(Window w, long style)
hints.decorations |= MWM_DECOR_TITLE; hints.decorations |= MWM_DECOR_TITLE;
} }
if (style & wxTHICK_FRAME) if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
{ {
wxLogDebug("MWM_DECOR_BORDER"); wxLogDebug("MWM_DECOR_BORDER");
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;