projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fixes for wxGTK1 after wxTextEntry changes (unit test still fails, Replac...
[wxWidgets.git]
/
include
/
wx
/
x11
/
private.h
diff --git
a/include/wx/x11/private.h
b/include/wx/x11/private.h
index 04df95a90c3a6a2eafd42a87d49377d2229c36af..955152cb3424aba1a5c9ca78086c9bec01fc2e5b 100644
(file)
--- a/
include/wx/x11/private.h
+++ b/
include/wx/x11/private.h
@@
-6,13
+6,14
@@
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRIVATE_H_
#define _WX_PRIVATE_H_
#include "wx/defs.h"
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRIVATE_H_
#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
#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"
// Include common declarations
#include "wx/x11/privx.h"
-#if wxUSE_
UNICODE
-#include
"pango/pango.h"
+#if wxUSE_
PANGO
+#include
<pango/pango.h>
#endif
#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
// ----------------------------------------------------------------------------
// Some Unicode <-> UTF8 macros stolen from GTK
@@
-52,6
+53,12
@@
class wxWindow;
// corresponding to the window for this widget
// ----------------------------------------------------------------------------
// 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);
extern void wxDeleteWindowFromTable(Window w);
extern wxWindow *wxGetWindowFromTable(Window w);
extern bool wxAddWindowToTable(Window w, wxWindow *win);
@@
-73,5
+80,9
@@
extern Window wxGetWindowParent(Window window);
bool wxSetWMDecorations(Window w, long style);
bool wxMWMIsRunning(Window w);
bool wxSetWMDecorations(Window w, long style);
bool wxMWMIsRunning(Window w);
+// Checks if any of our children are finished.
+// implemented in src/x11/utils.cpp
+void wxCheckForFinishedChildren();
+
#endif
// _WX_PRIVATE_H_
#endif
// _WX_PRIVATE_H_