X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/x11/private.h diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h index e2ae2945e7..6422308b63 100644 --- a/include/wx/x11/private.h +++ b/include/wx/x11/private.h @@ -13,21 +13,28 @@ #define _WX_PRIVATE_H_ #include "wx/defs.h" +#include "wx/hashmap.h" #include "wx/utils.h" +#if defined( __cplusplus ) && defined( __VMS ) +#pragma message disable nosimpint +#endif #include "X11/Xlib.h" #include "X11/Xatom.h" #include "X11/Xutil.h" +#if defined( __cplusplus ) && defined( __VMS ) +#pragma message enable nosimpint +#endif // Include common declarations #include "wx/x11/privx.h" -#if wxUSE_UNICODE -#include "pango/pango.h" +#if wxUSE_PANGO +#include #endif -class wxMouseEvent; -class wxKeyEvent; -class wxWindow; +class WXDLLIMPEXP_FWD_CORE wxMouseEvent; +class WXDLLIMPEXP_FWD_CORE wxKeyEvent; +class WXDLLIMPEXP_FWD_CORE wxWindow; // ---------------------------------------------------------------------------- // Some Unicode <-> UTF8 macros stolen from GTK @@ -46,6 +53,12 @@ class wxWindow; // corresponding to the window for this widget // ---------------------------------------------------------------------------- +WX_DECLARE_HASH_MAP(Window, wxWindow *, wxIntegerHash, wxIntegerEqual, wxWindowHash); + +// these hashes are defined in app.cpp +extern wxWindowHash *wxWidgetHashTable; +extern wxWindowHash *wxClientWidgetHashTable; + extern void wxDeleteWindowFromTable(Window w); extern wxWindow *wxGetWindowFromTable(Window w); extern bool wxAddWindowToTable(Window w, wxWindow *win); @@ -63,7 +76,7 @@ extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window windo extern Window wxGetWindowParent(Window window); // Set the window manager decorations according to the -// given wxWindows style +// given wxWidgets style bool wxSetWMDecorations(Window w, long style); bool wxMWMIsRunning(Window w);