Remove wxDataViewTextRendererAttr by merging it with wxDataViewTextRenderer.

[wxWidgets.git] / include / wx / gtk / app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 0ded824a5fb870e941a4badaf42fab662c5b2754..4dbda35c8bff3160efa8e38c2d6a55211dac928e 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -18,9 +18,9 @@
 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
@@ -60,10 +60,10 @@ public:
     // 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
     // -------------------------------
@@ -85,9 +85,9 @@ private:
 #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)
 };