X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4e83f385a58f00b1f97315ebd80f380d16ae472..df18cc7aa1afdbe74d4b8e398d12ef34d1e78b5c:/include/wx/utils.h?ds=sidebyside

diff --git a/include/wx/utils.h b/include/wx/utils.h
index d0eb5286dd..ea2630239c 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -266,21 +266,20 @@ private:
 // Returns the current state of the mouse position, buttons and modifers
 WXDLLEXPORT wxMouseState wxGetMouseState();
 
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // Window ID management
 // ----------------------------------------------------------------------------
 
-// Generate a unique ID
-WXDLLEXPORT long wxNewId();
-
 // Ensure subsequent IDs don't clash with this one
-WXDLLEXPORT void wxRegisterId(long id);
+WXDLLIMPEXP_BASE void wxRegisterId(long id);
 
 // Return the current ID
-WXDLLEXPORT long wxGetCurrentId();
+WXDLLIMPEXP_BASE long wxGetCurrentId();
 
-#endif // wxUSE_GUI
+// Generate a unique ID
+WXDLLIMPEXP_BASE long wxNewId();
 
 // ----------------------------------------------------------------------------
 // Various conversions
@@ -656,9 +655,11 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
 #endif // MSW
 
 // ----------------------------------------------------------------------------
-// Display and colorss (X only)
+// X11 Display access
 // ----------------------------------------------------------------------------
 
+#if defined(__X__) || defined(__WXGTK__)
+
 #ifdef __WXGTK__
     void *wxGetDisplay();
 #endif
@@ -675,6 +676,8 @@ inline struct _XDisplay *wxGetX11Display()
     return (_XDisplay *)wxGetDisplay();
 }
 
+#endif // X11 || wxGTK
+
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------