add support for asynchronous execution in wxBase (patch 1906889)

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

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index 1bedb8ace5317548b004eeb8c22cbc6601612837..c8dfd2b533b2d4ab996c6da69f27c195ca751d63 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -20,22 +20,20 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

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

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

-class WXDLLEXPORT wxPen: public wxGDIObject
+class WXDLLEXPORT wxPen : public wxGDIObject

 {
 public:
     wxPen() {}
     wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
 {
 public:
     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;
 
     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;
 


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

-    bool Ok() const;
-

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

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxPen)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPen)