// classes
//-----------------------------------------------------------------------------
-#if wxUSE_THREADS
-class WXDLLIMPEXP_FWD_BASE wxMutex;
-#endif
-
-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
typedef struct _HildonProgram HildonProgram;
-#endif // wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
//-----------------------------------------------------------------------------
// wxApp
// must return XVisualInfo pointer (it is not freed by caller)
virtual void *GetXVisualInfo() { return NULL; }
-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// Maemo-specific method: get the main program object
- HildonProgram *GetHildonProgram() const { return m_hildonProgram; }
-#endif // wxUSE_LIBHILDON
+ HildonProgram *GetHildonProgram();
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// implementation only from now on
// -------------------------------
bool m_isInAssert;
#if wxUSE_THREADS
- wxMutex* m_idleMutex;
+ wxMutex m_idleMutex;
#endif
guint m_idleSourceId;
-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
HildonProgram *m_hildonProgram;
-#endif // wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
DECLARE_DYNAMIC_CLASS(wxApp)
};