Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index d1443c05f53cb7cfcda11ef1fc9cabbd6d98ae63..2df4124c47bdad9ab69194728bdb7af6568be4b8 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -16,17 +16,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "gdicmn.h"
 #endif
 
     #pragma interface "gdicmn.h"
 #endif
 

-#include "wx/object.h"
+#include "wx/setup.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/hash.h"

 #include "wx/string.h"
 #include "wx/string.h"

-#include "wx/setup.h"
-#include "wx/colour.h"
-#include "wx/font.h"
+#include "wx/fontenc.h"

 
 // ---------------------------------------------------------------------------
 // forward declarations
 
 // ---------------------------------------------------------------------------
 // forward declarations


@@ -78,6 +75,8 @@ enum wxBitmapType
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,

+    wxBITMAP_TYPE_ANI,
+    wxBITMAP_TYPE_IFF,

     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50
     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50


@@ -88,6 +87,7 @@ enum wxStockCursor
 {
     wxCURSOR_NONE,          // should be 0
     wxCURSOR_ARROW,
 {
     wxCURSOR_NONE,          // should be 0
     wxCURSOR_ARROW,

+    wxCURSOR_RIGHT_ARROW,

     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,
     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,


@@ -115,6 +115,9 @@ enum wxStockCursor
 #ifdef __WXGTK__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif
 #ifdef __WXGTK__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif

+#ifdef __WXMAC__
+       wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow 
+#endif

 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,
 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,


@@ -148,31 +151,37 @@ enum wxStockCursor
 
 #ifdef __WXMSW__
     // Load from a resource
 
 #ifdef __WXMSW__
     // Load from a resource

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #elif defined(__WXPM__)
     // Load from a resource
 #elif defined(__WXPM__)
     // Load from a resource

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-    // Load from a resource
-    #define wxICON(X) wxIcon("" #X "")
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )

 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )

+#elif defined(__WXMAC__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )

 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )

+#elif defined(__WXX11__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( X##_xpm )

 #else
     // This will usually mean something on any platform
 #else
     // This will usually mean something on any platform

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #endif // platform
 
 /* Another macro: this one is for portable creation of bitmaps. We assume that
    under Unix bitmaps live in XPMs and under Windows they're in ressources.
  */
 
 #endif // platform
 
 /* Another macro: this one is for portable creation of bitmaps. We assume that
    under Unix bitmaps live in XPMs and under Windows they're in ressources.
  */
 

-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMGL__)
-    #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXPM__)
+    #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXMAC__) || defined(__WXMGL__)

     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms
     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms


@@ -190,14 +199,12 @@ enum wxStockCursor
 class WXDLLEXPORT wxSize
 {
 public:
 class WXDLLEXPORT wxSize
 {
 public:

-    // members are public for compatibility (don't use them directly,
-    // especially that there names were chosen very unfortunately - they should
-    // have been called width and height)
+    // members are public for compatibility, don't use them directly.

     int x, y;
 
     // constructors
     int x, y;
 
     // constructors

-    wxSize() { x = y = 0; }
-    wxSize(int xx, int yy) { Set(xx, yy); }
+    wxSize() : x(0), y(0) { }
+    wxSize(int xx, int yy) : x(xx), y(yy) { }

 
     // no copy ctor or assignment operator - the defaults are ok
 
 
     // no copy ctor or assignment operator - the defaults are ok
 


@@ -231,13 +238,14 @@ public:
     double x;
     double y;
 
     double x;
     double y;
 

-    wxRealPoint() { x = y = 0.0; };
-    wxRealPoint(double xx, double yy) { x = xx; y = yy; };
+    wxRealPoint() : x(0.0), y(0.0) { }
+    wxRealPoint(double xx, double yy) : x(xx), y(yy) { }

 
     wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
     wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }
 
     bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }
 
     wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
     wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }
 
     bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }

+    bool operator!=(const wxRealPoint& pt) const { return x != pt.x || y != pt.y; }

 };
 
 class WXDLLEXPORT wxPoint
 };
 
 class WXDLLEXPORT wxPoint


@@ -245,8 +253,8 @@ class WXDLLEXPORT wxPoint
 public:
     int x, y;
 
 public:
     int x, y;
 

-    wxPoint() { x = y = 0; };
-    wxPoint(int xx, int yy) { x = xx; y = yy; };
+    wxPoint() : x(0), y(0) { }
+    wxPoint(int xx, int yy) : x(xx), y(yy) { }

 
     // no copy ctor or assignment operator - the defaults are ok
 
 
     // no copy ctor or assignment operator - the defaults are ok
 


@@ -274,9 +282,12 @@ public:
 class WXDLLEXPORT wxRect
 {
 public:
 class WXDLLEXPORT wxRect
 {
 public:

-    wxRect() { x = y = width = height = 0; }
+    wxRect()
+        : x(0), y(0), width(0), height(0)
+        { }

     wxRect(int xx, int yy, int ww, int hh)
     wxRect(int xx, int yy, int ww, int hh)

-        { x = xx; y = yy; width = ww; height = hh; }
+        : x(xx), y(yy), width(ww), height(hh)
+        { }

     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& pos, const wxSize& size);
 
     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& pos, const wxSize& size);
 


@@ -295,7 +306,10 @@ public:
     void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }
     void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }

+    void SetPosition( const wxPoint &p ) { x = p.x; y = p.y; }
+

     wxSize GetSize() const { return wxSize(width, height); }
     wxSize GetSize() const { return wxSize(width, height); }

+    void SetSize( const wxSize &s ) { width = s.GetWidth(); height = s.GetHeight(); }

 
     int GetLeft()   const { return x; }
     int GetTop()    const { return y; }
 
     int GetLeft()   const { return x; }
     int GetTop()    const { return y; }