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

Linking now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-11 12:13:14 +00:00
parent 1b0b798d77
commit ea59668704
8 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/x11/install.txt
View File

@@ -43,7 +43,7 @@ COMPILING USING CONFIGURE
If you compile wxWindows on Linux for the first time and don't like to read If you compile wxWindows on Linux for the first time and don't like to read
install instructions just do (in the base dir): install instructions just do (in the base dir):
> ./configure --with-x11 --with-universal > ./configure --with-x11
> make > make
> su <type root password> > su <type root password>
> make install > make install

3
docs/x11/readme.txt
View File

@@ -16,7 +16,8 @@ Information on how to install can be found in the file
install.txt, but if you cannot wait, this should work on install.txt, but if you cannot wait, this should work on
many systems: many systems:
./configure --with-x11 --with-universal ./configure --with-x11 --disable-shared --with-x11 --with-debug_flag --enable-log --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -with-libjpeg --enable-debug_cntxt --disable-no_rtti"
make make
su <type root password> su <type root password>
make install make install

2
samples/minimal/minimal.cpp
View File

@@ -35,7 +35,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the application icon (under Windows and OS/2 it is in resources) // the application icon (under Windows and OS/2 it is in resources)
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
#include "mondrian.xpm" #include "mondrian.xpm"
#endif #endif

2
src/common/event.cpp
View File

@@ -728,6 +728,8 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
info = CLASSINFO(wxWindowMSW); info = CLASSINFO(wxWindowMSW);
# elif defined(__WXGTK__) # elif defined(__WXGTK__)
info = CLASSINFO(wxWindowGTK); info = CLASSINFO(wxWindowGTK);
# elif defined(__WXX11__)
info = CLASSINFO(wxWindowX11);
# elif defined(__WXMGL__) # elif defined(__WXMGL__)
info = CLASSINFO(wxWindowMGL); info = CLASSINFO(wxWindowMGL);
# elif defined(__WXPM__) # elif defined(__WXPM__)

11
src/x11/app.cpp
View File

@@ -598,6 +598,9 @@ void wxApp::DeletePendingObjects()
// Create an application context // Create an application context
bool wxApp::OnInitGui() bool wxApp::OnInitGui()
{ {
if (!wxAppBase::OnInitGui())
return FALSE;
// TODO: parse argv and get display to pass to XOpenDisplay // TODO: parse argv and get display to pass to XOpenDisplay
Display* dpy = XOpenDisplay(NULL); Display* dpy = XOpenDisplay(NULL);
m_initialDisplay = (WXDisplay*) dpy; m_initialDisplay = (WXDisplay*) dpy;
@@ -643,8 +646,12 @@ Window wxGetWindowParent(Window window)
{ {
Window parent, root = 0; Window parent, root = 0;
unsigned int noChildren = 0; unsigned int noChildren = 0;
if (XQueryTree((Display*) wxGetDisplay(), window, & root, & parent, Window* children = NULL;
NULL, & noChildren)) int res = XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
& children, & noChildren);
if (children)
XFree(children);
if (res)
return parent; return parent;
else else
return (Window) 0; return (Window) 0;

2
src/x11/popupwin.cpp
View File

@@ -61,7 +61,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
XWMHints wm_hints; XWMHints wm_hints;
long xattributes_mask = long xattributes_mask =
CWEventMask | CWOverrideRedirect |
CWBorderPixel | CWBackPixel; CWBorderPixel | CWBackPixel;
xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); xattributes.border_pixel = BlackPixel( xdisplay, xscreen );

2
src/x11/toplevel.cpp
View File

@@ -93,7 +93,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
XWMHints wm_hints; XWMHints wm_hints;
long xattributes_mask = long xattributes_mask =
CWEventMask | CWOverrideRedirect |
CWBorderPixel | CWBackPixel; CWBorderPixel | CWBackPixel;
xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); xattributes.border_pixel = BlackPixel( xdisplay, xscreen );

3
src/x11/window.cpp
View File

@@ -147,7 +147,8 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
Window window = XCreateSimpleWindow(wxGlobalDisplay(), parentWindow, Window window = XCreateSimpleWindow(wxGlobalDisplay(), parentWindow,
x, y, w, h, 0, x, y, w, h, 0,
m_backgroundColour.AllocColour(wxGlobalDisplay()), m_backgroundColour.AllocColour(wxGlobalDisplay()),
m_foregroundColour.AllocColour(wxGlobalDisplay())); m_foregroundColour.AllocColour(wxGlobalDisplay()));
m_mainWidget = (WXWindow) window;
// Select event types wanted // Select event types wanted
XSelectInput(wxGlobalDisplay(), window, XSelectInput(wxGlobalDisplay(), window,