added new wxCONTROL_FLAT bit (see discussion of patch 1691478)

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index aa50b49cf6c8a4bbffdf69daf798c1b4a60b68a3..95c50c06ab00924dfbfc0cf9699d335ebeeffdb1 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -22,10 +22,10 @@
 class WXDLLEXPORT wxPen : public wxGDIObject
 {
 public:
 class WXDLLEXPORT wxPen : public wxGDIObject
 {
 public:

-    wxPen();
+    wxPen() { }

     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);

-    virtual ~wxPen();
+    virtual ~wxPen() { }

 
     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }


@@ -54,16 +54,19 @@ public:
     int GetDashCount() const;
     wxBitmap* GetStipple() const;
 
     int GetDashCount() const;
     wxBitmap* GetStipple() const;
 

-    // Internal
-    bool RealizeResource();
-    bool FreeResource(bool force = false);
-    WXHANDLE GetResourceHandle() const;
-    bool IsFree() const;
+    // internal: wxGDIObject methods
+    virtual bool RealizeResource();
+    virtual bool FreeResource(bool force = false);
+    virtual WXHANDLE GetResourceHandle() const;
+    virtual bool IsFree() const;

 
 protected:
     virtual wxObjectRefData* CreateRefData() const;
     virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
 
 
 protected:
     virtual wxObjectRefData* CreateRefData() const;
     virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
 

+    // same as FreeResource() + RealizeResource()
+    bool Recreate();
+

     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPen)
 };