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

Various compile fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2002-02-11 12:04:35 +00:00
parent 6a44bffd1a
commit 1b0b798d77
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/univ/window.h
View File

@ -61,6 +61,8 @@ enum
#define wxWindowNative wxWindowGTK
#elif defined(__WXMGL__)
#define wxWindowNative wxWindowMGL
#elif defined(__WXX11__)
#define wxWindowNative wxWindowX11
#elif defined(__WXMAC__)
#define wxWindowNative wxWindowMac
#endif

2
include/wx/x11/private.h
View File

@ -15,6 +15,8 @@
#include "wx/defs.h"
#include "wx/utils.h"
#include "X11/Xlib.h"
#include "X11/Xatom.h"
#include "X11/Xutil.h"
class wxMouseEvent;
class wxKeyEvent;

3
src/x11/popupwin.cpp
View File

@ -42,6 +42,9 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
// All dialogs should really have this style
m_windowStyle = style;
m_windowStyle |= wxTAB_TRAVERSAL;
wxPoint pos( 20,20 );
wxSize size( 20,20 );
m_parent = parent;
if (m_parent) m_parent->AddChild( this );

9
src/x11/toplevel.cpp
View File

@ -38,11 +38,9 @@
#endif //WX_PRECOMP
#include "wx/x11/private.h"
#include "X11/Xatom.h"
#include "X11/Xutil.h"
// list of all frames and modeless dialogs
// wxWindowList wxModelessWindows;
bool wxMWMIsRunning(Window w);
// ----------------------------------------------------------------------------
// wxTopLevelWindowX11 creation
@ -256,8 +254,7 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
}
XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
wmHints);
XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
XFree(wmHints);
}
}

7
src/x11/window.cpp
View File

@ -325,7 +325,11 @@ void wxWindowX11::DoCaptureMouse()
}
res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
#if 0
ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
#else
FALSE,
#endif
GrabModeAsync,
GrabModeAsync,
CurrentTime);
@ -1309,8 +1313,9 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
if (!GetMainWindow())
return FALSE;
wxColour colour( col );
XSetWindowAttributes attrib;
attrib.background_pixel = ((wxColour&)col).AllocColour(wxGlobalDisplay());
attrib.background_pixel = colour.AllocColour(wxGlobalDisplay());
XChangeWindowAttributes(wxGlobalDisplay(),
(Window) GetMainWindow(),