Implement best size calculation for report mode wxListCtrl.

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

diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index b6d99455bc262e9db82c5d1812319991a5b39dec..28095a27db27b79004660c663369a81350fdf61a 100644 (file)
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -21,7 +21,7 @@ typedef WXDWORD wxMSWDash;
 class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // VZ: this class should be made private
 class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // VZ: this class should be made private

-class WXDLLEXPORT wxPenRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPenRefData : public wxGDIRefData

 {
 public:
     wxPenRefData();
 {
 public:
     wxPenRefData();


@@ -57,7 +57,7 @@ private:
     friend class WXDLLIMPEXP_FWD_CORE wxPen;
 
     // Cannot use
     friend class WXDLLIMPEXP_FWD_CORE wxPen;
 
     // Cannot use

-    //  DECLARE_NO_COPY_CLASS(wxPenRefData)
+    //  wxDECLARE_NO_COPY_CLASS(wxPenRefData);

     // because copy constructor is explicitly declared above;
     // but no copy assignment operator is defined, so declare
     // it private to prevent the compiler from defining it:
     // because copy constructor is explicitly declared above;
     // but no copy assignment operator is defined, so declare
     // it private to prevent the compiler from defining it:


@@ -71,13 +71,13 @@ private:
 // Pen
 // ----------------------------------------------------------------------------
 
 // Pen
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPen : public wxPenBase
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase

 {
 public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
 {
 public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);

-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );

 #endif
 
     wxPen(const wxBitmap& stipple, int width);
 #endif
 
     wxPen(const wxBitmap& stipple, int width);


@@ -104,20 +104,20 @@ public:
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 

-    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-    wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-    wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-    wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }
+    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }
+    wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }
+    wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }
+    wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }

     int GetDashes(wxDash **ptr) const
     {
     int GetDashes(wxDash **ptr) const
     {

-        *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+        *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL);

         return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
     }
         return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
     }

-    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
-    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
+    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); }
+    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }

 
 

-    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
+    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }

 
     // Internal
     bool RealizeResource();
 
     // Internal
     bool RealizeResource();


@@ -125,6 +125,11 @@ public:
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
 
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+

 protected:
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 protected:
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;