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

wxX11: link errors down to 1.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2002-02-10 23:31:24 +00:00
parent 1246e28fb0
commit 8354aa92a1
12 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/msw/tmake/filelist.txt
View File

@ -95,7 +95,7 @@ notebook.cpp Generic NotWin32,NotGTK,NotOS2,NotMGL,NotX11,NotMac,NotMicro
numdlgg.cpp Generic
paletteg.cpp Generic NotMSW,NotX,NotOS2,NotMGL,NotX11,NotMac,NotMicro
panelg.cpp Generic
printps.cpp Generic NotMSW,NotX11
printps.cpp Generic NotMSW
prntdlgg.cpp Generic NotMSW
progdlgg.cpp Generic
prop.cpp Generic
@ -615,6 +615,7 @@ dcmemory.cpp X11
dcscreen.cpp X11
dcscreen.cpp X11
evtloop.cpp X11
font.cpp X11
gdiobj.cpp X11
glcanvas.cpp X11
icon.cpp X11

6
include/wx/x11/popupwin.h
View File

@ -31,19 +31,17 @@ public:
wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
{ (void)Create(parent, flags); }
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
virtual bool Show( bool show = TRUE );
// implementation
// --------------
protected:
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupWindow)

3
include/wx/x11/toplevel.h
View File

@ -98,8 +98,5 @@ protected:
wxString m_title;
};
// list of all frames and modeless dialogs
;; extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
#endif // _WX_X11_TOPLEVEL_H_

1
include/wx/x11/window.h
View File

@ -171,7 +171,6 @@ protected:
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
virtual void DoCaptureMouse();
virtual void DoReleaseMouse();

2
src/univ/winuniv.cpp
View File

@ -73,6 +73,8 @@
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
#elif defined(__WXMGL__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)
#elif defined(__WXX11__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11)
#elif defined(__WXPM__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowOS2)
#endif

6
src/x11/app.cpp
View File

@ -60,8 +60,6 @@ wxApp *wxTheApp = NULL;
wxHashTable *wxWidgetHashTable = NULL;
static Window wxGetParentWindow(Window window);
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
@ -296,7 +294,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
// TODO: may need to translate coordinates from actualWindow
// to window, if the receiving window != wxWindow window
while (window && !(win = wxGetWindowFromTable(window)))
window = wxGetParentWindow(window);
window = wxGetWindowParent(window);
// TODO: shouldn't all the ProcessEvents below
// be win->GetEventHandler()->ProcessEvent?
@ -643,7 +641,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
return (WXColormap) c;
}
Window wxGetParentWindow(Window window)
Window wxGetWindowParent(Window window)
{
Window parent, root = 0;
unsigned int noChildren = 0;

6
src/x11/files.lst
View File

@ -14,6 +14,7 @@ ALL_SOURCES = \
x11/dcmemory.cpp \
x11/dcscreen.cpp \
x11/evtloop.cpp \
x11/font.cpp \
x11/gdiobj.cpp \
x11/glcanvas.cpp \
x11/gsockx11.c \
@ -23,6 +24,7 @@ ALL_SOURCES = \
x11/minifram.cpp \
x11/palette.cpp \
x11/pen.cpp \
x11/popupwin.cpp \
x11/region.cpp \
x11/settings.cpp \
x11/timer.cpp \
@ -90,6 +92,7 @@ ALL_SOURCES = \
generic/msgdlgg.cpp \
generic/numdlgg.cpp \
generic/panelg.cpp \
generic/printps.cpp \
generic/prntdlgg.cpp \
generic/progdlgg.cpp \
generic/prop.cpp \
@ -637,6 +640,7 @@ GUIOBJS = \
dcmemory.o \
dcscreen.o \
evtloop.o \
font.o \
gdiobj.o \
glcanvas.o \
gsockx11.o \
@ -646,6 +650,7 @@ GUIOBJS = \
minifram.o \
palette.o \
pen.o \
popupwin.o \
region.o \
settings.o \
timer.o \
@ -843,6 +848,7 @@ GENERICOBJS = \
msgdlgg.o \
numdlgg.o \
panelg.o \
printps.o \
prntdlgg.o \
progdlgg.o \
prop.o \

1
src/x11/font.cpp
View File

@ -38,6 +38,7 @@
#include "wx/fontutil.h" // for wxNativeFontInfo
#include "wx/tokenzr.h"
#include "wx/settings.h"
#include "wx/x11/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

2
src/x11/popupwin.cpp
View File

@ -33,8 +33,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
bool wxPopupWindow::Create( wxWindow *parent, int style )
{
m_needParent = FALSE;
if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, "popup" ))
{
wxFAIL_MSG( wxT("wxPopupWindow creation failed") );

11
src/x11/toplevel.cpp
View File

@ -48,14 +48,6 @@ static bool SetWMDecorations(Widget w, long style);
#endif
static bool MWMIsRunning(Window w);
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
// list of all frames and modeless dialogs
// wxWindowList wxModelessWindows;
// ----------------------------------------------------------------------------
// wxTopLevelWindowX11 creation
// ----------------------------------------------------------------------------
@ -164,9 +156,6 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
{
wxTopLevelWindows.DeleteObject(this);
if ( wxModelessWindows.Find(this) )
wxModelessWindows.DeleteObject(this);
// If this is the last top-level window, exit.
if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
{

4
src/x11/utils.cpp
View File

@ -152,9 +152,11 @@ static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
XtRemoveInput(*id);
}
#endif
int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
{
#if 0
XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
fd,
(XtPointer *) XtInputReadMask,
@ -162,8 +164,8 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
(XtPointer) proc_data);
return (int)id;
}
#endif
}
// ----------------------------------------------------------------------------
// misc

2
src/x11/window.cpp
View File

@ -74,7 +74,7 @@ static wxWindow* g_captureWindow = NULL;
// event tables
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxWindowX11, wxWindowBase)
IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)
BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)