fix MDI child sizing, which was working more or less by accident before I broke it...

[wxWidgets.git] / include / wx / mgl / pen.h

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index a4f59afc5b02df1429261497b6e88d7c516a79cb..6dd307ae0c20ea23aa00e4e4b22159f2e6bc1cea 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -20,8 +20,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 //-----------------------------------------------------------------------------
 // wxPen
 
 //-----------------------------------------------------------------------------
 // wxPen


@@ -33,14 +33,12 @@ public:
     wxPen() {}
     wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
     wxPen() {}
     wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);

-    wxPen(const wxPen& pen);
-    ~wxPen() {}
-    wxPen& operator = (const wxPen& pen);
+    virtual ~wxPen() {}

     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;
 
     void SetColour(const wxColour &colour);
     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;
 
     void SetColour(const wxColour &colour);

-    void SetColour(const unsigned char red, const unsigned char green, const unsigned char blue);
+    void SetColour(unsigned char red, unsigned char green, unsigned char blue);

     void SetCap(int capStyle);
     void SetJoin(int joinStyle);
     void SetStyle(int style);
     void SetCap(int capStyle);
     void SetJoin(int joinStyle);
     void SetStyle(int style);


@@ -58,7 +56,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation:
     void* GetPixPattern() const;
 
     // implementation:
     void* GetPixPattern() const;