Rebake from clean wx tree.

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

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 4aa7098beeda9d250f6f497068e676337602385c..4767a9431d39ed2644ecad63f522b77c0f788b4b 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -26,10 +26,10 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-class WXDLLIMPEXP_CORE wxMouseEvent;
-class WXDLLIMPEXP_CORE wxKeyEvent;
-class WXDLLIMPEXP_CORE wxWindow;
-class WXDLLIMPEXP_CORE 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


@@ -67,9 +67,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);
 
 // Is the window visible?
 bool wxWindowIsVisible(Window win);


@@ -148,7 +146,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 +167,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;
 };