Missing CHARSET_HANGUL fix.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index fbbe12fa966dc2ede350f01c0e44cc19d0f60b3f..3b5fb2e41021b426b83cbb1ce9ffe5af49c5f73d 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -181,7 +181,7 @@ enum wxStockCursor
 
 #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__)
+#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
@@ -365,18 +365,6 @@ public:
     // return TRUE if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
 
-    // align in another rectangle according to WX alignment flags.
-    void AlignIn(const wxRect& rect, int align)
-    {
-        if (align & wxALIGN_CENTER_HORIZONTAL) x = rect.x + (rect.width-width)/2;
-        else if (align & wxALIGN_RIGHT) x = rect.x+rect.width - width;
-        else x = rect.x;
-
-        if (align & wxALIGN_CENTER_VERTICAL) y = rect.y + (rect.height-height)/2;
-        else if (align & wxALIGN_BOTTOM) y = rect.y+rect.height - height;
-        else y = rect.y;
-    }
-
 public:
     int x, y, width, height;
 };
@@ -413,8 +401,6 @@ public:
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
 };
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
 class WXDLLEXPORT wxFontList : public wxList
 {
     DECLARE_DYNAMIC_CLASS(wxFontList)