Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / x11 / privx.h

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 6a9c5336be2bdefe0523677ebe46682003ed2c2c..7cfd8616adf2976b8da58392c64e3b96798b0060 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        privx.h
+// Name:        wx/x11/privx.h

 // Purpose:     Private declarations common to X11 and Motif ports
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Private declarations common to X11 and Motif ports
 // Author:      Julian Smart
 // Modified by:


@@ -26,23 +26,20 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-class wxMouseEvent;
-class wxKeyEvent;
-class wxWindow;
-class wxRegion;
+class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxRegion;

 
 // ----------------------------------------------------------------------------
 // key events related functions
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // key events related functions
 // ----------------------------------------------------------------------------
 

-extern int wxCharCodeXToWX(KeySym keySym);
-extern KeySym wxCharCodeWXToX(int id);
-
-int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
+WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);

 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 extern XColor g_itemColors[];
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 extern XColor g_itemColors[];

-extern int wxComputeColours (Display *display, wxColour * back, wxColour * fore);
+extern int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore);

 
 // For convenience
 inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
 
 // For convenience
 inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }


@@ -67,12 +64,7 @@ void wxAllocNearestColor(Display *display,Colormap colormap,XColor *xcolor);
 void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 
 // For debugging
 void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 
 // For debugging

-#ifdef __WXDEBUG__

 wxString wxGetXEventName(XEvent& event);
 wxString wxGetXEventName(XEvent& event);

-#endif
-
-// Is the window visible?
-bool wxWindowIsVisible(Window win);

 
 #if wxUSE_NANOX
 #define XEventGetWindow(event) event->general.wid
 
 #if wxUSE_NANOX
 #define XEventGetWindow(event) event->general.wid


@@ -148,7 +140,7 @@ bool wxWindowIsVisible(Window win);
 
 bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
 
 
 bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
 

-class WXDLLEXPORT wxXVisualInfo
+class WXDLLIMPEXP_CORE wxXVisualInfo

 {
 public:
     wxXVisualInfo();
 {
 public:
     wxXVisualInfo();


@@ -169,7 +161,7 @@ public:
     int                   m_visualRedPrec;
     int                   m_visualGreenPrec;
     int                   m_visualBluePrec;
     int                   m_visualRedPrec;
     int                   m_visualGreenPrec;
     int                   m_visualBluePrec;

-    
+

     unsigned char        *m_colorCube;
 };
 
     unsigned char        *m_colorCube;
 };