X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d171743ed3ddbf0178a9d68cf78999a3ca999826..2724d84bbefd440b4e63997eb45ec9636bcd955d:/include/wx/x11/private.h diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h index bec9db0561..0e8f9c6e15 100644 --- a/include/wx/x11/private.h +++ b/include/wx/x11/private.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: private.h +// Name: wx/x11/private.h // Purpose: Private declarations for X11 port // Author: Julian Smart // Modified by: @@ -13,6 +13,7 @@ #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 @@ -27,13 +28,13 @@ // 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 @@ -52,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); @@ -69,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);