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

Typos and other fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-11 11:42:06 +00:00
parent b28d3abf7e
commit 6a44bffd1a
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/x11/toplevel.cpp
View File

@@ -103,7 +103,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
m_mainWindow = (WXWindow) xwindow;
m_mainWidget = (WXWindow) xwindow;
XSelectInput( xdisplay, xwindow,
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
@@ -246,14 +246,14 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
if (icon.Ok() && GetMainWindow())
{
XWMHints *wmHints = XAllocWMHints();
wmHints.icon_pixmap = (Pixmap) icon.GetPixmap();
wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
wmHints.flags = IconPixmapHint;
wmHints->flags = IconPixmapHint;
if (icon.GetMask())
{
wmHints.flags |= IconMaskHint;
wmHints.icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
wmHints->flags |= IconMaskHint;
wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
}
XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
@@ -320,7 +320,7 @@ struct MwmHints {
// given wxWindows style
bool wxSetWMDecorations(Window w, long style)
{
if (!MWMIsRunning(w))
if (!wxMWMIsRunning(w))
return FALSE;
Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
@@ -374,7 +374,7 @@ bool wxSetWMDecorations(Window w, long style)
XChangeProperty(wxGlobalDisplay(),
w,
mwm_wm_hints, mem_wm_hints,
mwm_wm_hints, mwm_wm_hints,
32, PropModeReplace,
(unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
@@ -401,4 +401,4 @@ bool wxMWMIsRunning(Window w)
return (ret == Success);
}