Give GTK specific (but public) methods a Gtk prefix

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index fc3b0796587ba1331f7b50d64f0fa6f7c9ea3214..20e613dbd3408d30ea7f8ae8199fc90910d620db 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -85,6 +85,13 @@ enum wxBitmapType
     wxBITMAP_TYPE_ANY = 50
 };
 
     wxBITMAP_TYPE_ANY = 50
 };
 

+//  Polygon filling mode
+enum wxPolygonFillMode
+{
+    wxODDEVEN_RULE = 1,
+    wxWINDING_RULE
+};
+

 // Standard cursors
 enum wxStockCursor
 {
 // Standard cursors
 enum wxStockCursor
 {


@@ -128,14 +135,23 @@ enum wxStockCursor
     wxCURSOR_BASED_ARROW_UP,
     wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11
     wxCURSOR_BASED_ARROW_UP,
     wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11

-

     wxCURSOR_ARROWWAIT,
     wxCURSOR_ARROWWAIT,

+#ifdef __WXMAC__
+    wxCURSOR_OPEN_HAND,
+    wxCURSOR_CLOSED_HAND,
+#endif

 
     wxCURSOR_MAX
 };
 
 #ifndef __WXGTK__
 
     wxCURSOR_MAX
 };
 
 #ifndef __WXGTK__

-    #define wxCURSOR_DEFAULT wxCURSOR_ARROW
+    #define wxCURSOR_DEFAULT        wxCURSOR_ARROW
+#endif
+
+#ifndef __WXMAC__
+    // TODO CS supply openhand and closedhand cursors
+    #define wxCURSOR_OPEN_HAND      wxCURSOR_HAND
+    #define wxCURSOR_CLOSED_HAND    wxCURSOR_HAND

 #endif
 
 // ---------------------------------------------------------------------------
 #endif
 
 // ---------------------------------------------------------------------------


@@ -819,6 +835,7 @@ extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
 extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
 extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
 extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
 extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
 extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
 extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();

+extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();

 
 // Get position and size of the display workarea
 extern void WXDLLIMPEXP_CORE wxClientDisplayRect(int *x, int *y, int *width, int *height);
 
 // Get position and size of the display workarea
 extern void WXDLLIMPEXP_CORE wxClientDisplayRect(int *x, int *y, int *width, int *height);