wxX11: link errors down to 1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 4d71796efaa2e873e620c6b59c90a78e8486cc82..fca93b4db3aa1e9837f9dda804b48bf7bb6cb403 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -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
 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
 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
 dcscreen.cpp   X11
 dcscreen.cpp   X11
 evtloop.cpp    X11

+font.cpp       X11

 gdiobj.cpp     X11
 glcanvas.cpp   X11
 icon.cpp       X11
 gdiobj.cpp     X11
 glcanvas.cpp   X11
 icon.cpp       X11

diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 5d38c0c01a0c5b1acc0cf776b420a0c9fb089d93..3fd5ddde0566e773ecc7b320b14e3318459d331b 100644 (file)
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -31,19 +31,17 @@ public:
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 
     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 );
 
     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);
 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)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 9fcbf1c0e4650b2553a344cd957b93cf8f76223e..4f75c698caee662a3ead609cbd7ebdc52e52418b 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -98,8 +98,5 @@ protected:
     wxString              m_title;
 };
 
     wxString              m_title;
 };
 

-// list of all frames and modeless dialogs
-;; extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
-

 #endif // _WX_X11_TOPLEVEL_H_
 
 #endif // _WX_X11_TOPLEVEL_H_
 

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 61ad111397249ccf190c6df7466d15ddf84b8eae..5383f7d3ba51424bd0537c487fe4703789b74c2e 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -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);
         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();
     
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index a6dad52328fa9358abfe7a4769748810e06df1b7..56bf92060d7e57522df49d46e48d6cc451b29a0c 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -73,6 +73,8 @@
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXMGL__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)
     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
 #elif defined(__WXPM__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowOS2)
 #endif

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index ebcb2d9da1ce6ffc6571bc4ffe9246d85126cda2..f1d67cd58b3c847b0b77bcc3b31fa7fdc731782d 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -60,8 +60,6 @@ wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 
 
 wxHashTable *wxWidgetHashTable = NULL;
 

-static Window wxGetParentWindow(Window window);
-

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 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)))
     // 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?
 
     // TODO: shouldn't all the ProcessEvents below
     // be win->GetEventHandler()->ProcessEvent?


@@ -643,7 +641,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
     return (WXColormap) c;
 }
 
     return (WXColormap) c;
 }
 

-Window wxGetParentWindow(Window window)
+Window wxGetWindowParent(Window window)

 {
     Window parent, root = 0;
     unsigned int noChildren = 0;
 {
     Window parent, root = 0;
     unsigned int noChildren = 0;

diff --git a/src/x11/files.lst b/src/x11/files.lst
index 65681655a4b03ee4b41f196f84a92d79482ec6ba..c073bbfbc4d7eac24da1c2ad792098057bf795b9 100644 (file)
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -14,6 +14,7 @@ ALL_SOURCES = \
                x11/dcmemory.cpp \
                x11/dcscreen.cpp \
                x11/evtloop.cpp \
                x11/dcmemory.cpp \
                x11/dcscreen.cpp \
                x11/evtloop.cpp \

+               x11/font.cpp \

                x11/gdiobj.cpp \
                x11/glcanvas.cpp \
                x11/gsockx11.c \
                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/minifram.cpp \
                x11/palette.cpp \
                x11/pen.cpp \

+               x11/popupwin.cpp \

                x11/region.cpp \
                x11/settings.cpp \
                x11/timer.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/msgdlgg.cpp \
                generic/numdlgg.cpp \
                generic/panelg.cpp \

+               generic/printps.cpp \

                generic/prntdlgg.cpp \
                generic/progdlgg.cpp \
                generic/prop.cpp \
                generic/prntdlgg.cpp \
                generic/progdlgg.cpp \
                generic/prop.cpp \


@@ -637,6 +640,7 @@ GUIOBJS = \
                dcmemory.o \
                dcscreen.o \
                evtloop.o \
                dcmemory.o \
                dcscreen.o \
                evtloop.o \

+               font.o \

                gdiobj.o \
                glcanvas.o \
                gsockx11.o \
                gdiobj.o \
                glcanvas.o \
                gsockx11.o \


@@ -646,6 +650,7 @@ GUIOBJS = \
                minifram.o \
                palette.o \
                pen.o \
                minifram.o \
                palette.o \
                pen.o \

+               popupwin.o \

                region.o \
                settings.o \
                timer.o \
                region.o \
                settings.o \
                timer.o \


@@ -843,6 +848,7 @@ GENERICOBJS = \
                msgdlgg.o \
                numdlgg.o \
                panelg.o \
                msgdlgg.o \
                numdlgg.o \
                panelg.o \

+               printps.o \

                prntdlgg.o \
                progdlgg.o \
                prop.o \
                prntdlgg.o \
                progdlgg.o \
                prop.o \

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 115f1849abfbf54919cc845b00c02ce0809e7b27..d58155d263445fb395781cb707850284c94cbef9 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -38,6 +38,7 @@
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"

+#include "wx/x11/private.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index a030e98cc6e9d396bb3581e3bf3c31ba2c416b0d..fe1d27c1ed175719281d77f5991f1b8d2386e734 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -33,8 +33,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
 
 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") );
     if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, "popup" ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 779bb40699c905c9ef277762d4bfa9e1bc71cc1b..54389a216103a29e51eda5516b6d5f4106b01ef4 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -48,14 +48,6 @@ static bool SetWMDecorations(Widget w, long style);
 #endif
 static bool MWMIsRunning(Window w);
 
 #endif
 static bool MWMIsRunning(Window w);
 

-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// list of all frames and modeless dialogs
-// wxWindowList wxModelessWindows;
-

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation
 // ----------------------------------------------------------------------------


@@ -164,9 +156,6 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
 {
     wxTopLevelWindows.DeleteObject(this);
 
 {
     wxTopLevelWindows.DeleteObject(this);
 

-    if ( wxModelessWindows.Find(this) )
-        wxModelessWindows.DeleteObject(this);
-

     // If this is the last top-level window, exit.
     if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
     {
     // If this is the last top-level window, exit.
     if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
     {

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index d6b5b7df84cbdb8623b8ea6f94f95d273eec6320..cad46c2911e1143b5842fa0e868fc74bdca0501f 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -152,9 +152,11 @@ static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
 
     XtRemoveInput(*id);
 }
 
     XtRemoveInput(*id);
 }

+#endif

 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {

+#if 0

     XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                                  fd,
                                  (XtPointer *) XtInputReadMask,
     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;
                                  (XtPointer) proc_data);
 
     return (int)id;

-}

 #endif
 #endif

+}

 
 // ----------------------------------------------------------------------------
 // misc
 
 // ----------------------------------------------------------------------------
 // misc

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 28993a53106d51ef5dcbd988016da7fc44e11efe..c8c3d5dbf3308a30c1969b7889206c9b430016b1 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -74,7 +74,7 @@ static wxWindow* g_captureWindow = NULL;
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxWindowX11, wxWindowBase)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)

 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)
 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)