clear up wxStringBuffer docs a bit

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 85d5ad61508f5ee3a9507ee24f43c5746f1faf8b..7741ee467e5d4276b39d9acd9cfd46ff12ed75f4 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -24,21 +24,22 @@
 #include "wx/list.h"
 #include "wx/string.h"
 #include "wx/fontenc.h"
 #include "wx/list.h"
 #include "wx/string.h"
 #include "wx/fontenc.h"

+#include "wx/hashmap.h"

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

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBrush;
-class WXDLLEXPORT wxColour;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxPalette;
-class WXDLLEXPORT wxPen;
-class WXDLLEXPORT wxRegion;
-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxCursor;
+class WXDLLIMPEXP_CORE wxFont;
+class WXDLLIMPEXP_CORE wxIcon;
+class WXDLLIMPEXP_CORE wxPalette;
+class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_CORE wxRegion;
+class WXDLLIMPEXP_BASE wxString;

 
 // ---------------------------------------------------------------------------
 // constants
 
 // ---------------------------------------------------------------------------
 // constants


@@ -116,7 +117,7 @@ enum wxStockCursor
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif
 #ifdef __WXMAC__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif
 #ifdef __WXMAC__

-       wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow
+    wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow

 #endif
 #ifdef __X__
     // Not yet implemented for Windows
 #endif
 #ifdef __X__
     // Not yet implemented for Windows


@@ -181,7 +182,12 @@ enum wxStockCursor
 
 #if defined(__WXMSW__) || defined(__WXPM__)
     #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
 
 #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__) || defined(__WXCOCOA__)
+#elif defined(__WXGTK__)   || \
+      defined(__WXMOTIF__) || \
+      defined(__WXX11__)   || \
+      defined(__WXMAC__)   || \
+      defined(__WXMGL__)   || \
+      defined(__WXCOCOA__)

     // 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


@@ -228,15 +234,15 @@ public:
     int GetWidth() const { return x; }
     int GetHeight() const { return y; }
 
     int GetWidth() const { return x; }
     int GetHeight() const { return y; }
 

-    bool IsFullySpecified() const { return x != -1 && y != -1; }
+    bool IsFullySpecified() const { return x != wxDefaultCoord && y != wxDefaultCoord; }

 
     // combine this size with the other one replacing the default (i.e. equal
 
     // combine this size with the other one replacing the default (i.e. equal

-    // to -1) components of this object with those of the other
+    // to wxDefaultCoord) components of this object with those of the other

     void SetDefaults(const wxSize& size)
     {
     void SetDefaults(const wxSize& size)
     {

-        if ( x == -1 )
+        if ( x == wxDefaultCoord )

             x = size.x;
             x = size.x;

-        if ( y == -1 )
+        if ( y == wxDefaultCoord )

             y = size.y;
     }
 
             y = size.y;
     }
 


@@ -308,6 +314,7 @@ public:
         { }
     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);

+    wxRect(const wxSize& size);

 
     // default copy ctor and assignment operators ok
 
 
     // default copy ctor and assignment operators ok
 


@@ -386,11 +393,11 @@ public:
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 

-    // return TRUE if the point is (not strcitly) inside the rect
+    // return true if the point is (not strcitly) inside the rect

     bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
 
     bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
 

-    // return TRUE if the rectangles have a non empty intersection
+    // return true if the rectangles have a non empty intersection

     bool Intersects(const wxRect& rect) const;
 
 public:
     bool Intersects(const wxRect& rect) const;
 
 public:


@@ -434,12 +441,12 @@ public:
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,

-                             bool underline = FALSE,
+                             bool underline = false,

                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 
                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 

-class WXDLLEXPORT wxStringToColourHashMap;
+WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );

 
 class WXDLLEXPORT wxColourDatabase
 {
 
 class WXDLLEXPORT wxColourDatabase
 {


@@ -475,7 +482,7 @@ private:
 class WXDLLEXPORT wxBitmapList : public wxList
 {
 public:
 class WXDLLEXPORT wxBitmapList : public wxList
 {
 public:

-    wxBitmapList();
+    wxBitmapList(){}

     ~wxBitmapList();
 
     void AddBitmap(wxBitmap *bitmap);
     ~wxBitmapList();
 
     void AddBitmap(wxBitmap *bitmap);