Richtext interface fixes and additions for Phoenix

[wxWidgets.git] / include / wx / dfb / private.h

diff --git a/include/wx/dfb/private.h b/include/wx/dfb/private.h
index 23c6d830acaaa855af89431604aeed8341240648..6193cc975f3e9e162db673f863145f6464fcbc58 100644 (file)
--- a/include/wx/dfb/private.h
+++ b/include/wx/dfb/private.h
@@ -17,47 +17,6 @@
 #include "wx/dfb/wrapdfb.h"
 #include <directfb_version.h>
 
 #include "wx/dfb/wrapdfb.h"
 #include <directfb_version.h>
 

-//-----------------------------------------------------------------------------
-// strings conversion
-//-----------------------------------------------------------------------------
-
-// convert string from wxString to UTF-8 encoded const char*
-#if wxUSE_UNICODE
-    #define wxSTR_TO_DFB(s)    (s).mb_str(wxConvUTF8)
-#else
-    #define wxSTR_TO_DFB(s)    wxConvUTF8.cWC2MB((s).wc_str(*wxConvUI))
-#endif
-
-//-----------------------------------------------------------------------------
-// surface manipulation helpers
-//-----------------------------------------------------------------------------
-
-/// Mode of wxDfbCloneSurface() call
-enum wxDfbCloneSurfaceMode
-{
-    /// Don't copy surface pixels, just clone surface size and attributes
-    wxDfbCloneSurface_NoPixels = 0,
-    /// Make exact copy, including the pixels
-    wxDfbCloneSurface_CopyPixels
-};
-
-/**
-    Creates a new surface by cloning existing one. Depending on @a mode,
-    either makes exact copy (wxDfbCloneSurface_CopyPixels) or only creates a
-    new surface with the same size and attributes (wxDfbCloneSurface_NoPixels).
- */
-wxIDirectFBSurfacePtr wxDfbCloneSurface(const wxIDirectFBSurfacePtr& s,
-                                        wxDfbCloneSurfaceMode mode);
-
-/// Returns bit depth used by the surface
-int wxDfbGetSurfaceDepth(const wxIDirectFBSurfacePtr& s);
-
-/// Returns interface to the primary display layer:
-wxIDirectFBDisplayLayerPtr wxDfbGetDisplayLayer();
-
-/// Returns interface to the primary surface:
-wxIDirectFBSurfacePtr wxDfbGetPrimarySurface();
-

 //-----------------------------------------------------------------------------
 // misc helpers
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // misc helpers
 //-----------------------------------------------------------------------------