Added wx/listbase.h with wxListCtrl types, so we can

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

diff --git a/include/wx/motif/pen.h b/include/wx/motif/pen.h
index b0a30769e1c57335ea92059700b5d421e60c6eef..35247eb99c2ef628dc31c9bd4368ac14180d24d6 100644 (file)
--- a/include/wx/motif/pen.h
+++ b/include/wx/motif/pen.h
@@ -31,16 +31,16 @@ public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
     ~wxPenRefData();
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
     ~wxPenRefData();

-
+    

 protected:
 protected:

-  int           m_width;
-  int           m_style;
-  int           m_join ;
-  int           m_cap ;
-  wxBitmap      m_stipple ;
-  int           m_nbDash ;
-  wxMOTIFDash  *m_dash ;
-  wxColour      m_colour;
+    int           m_width;
+    int           m_style;
+    int           m_join ;
+    int           m_cap ;
+    wxBitmap      m_stipple ;
+    int           m_nbDash ;
+    wxMOTIFDash  *m_dash ;
+    wxColour      m_colour;

 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)


@@ -48,55 +48,55 @@ protected:
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)
+    DECLARE_DYNAMIC_CLASS(wxPen)

 public:
 public:

-  wxPen();
-  wxPen(const wxColour& col, int width, int style);
-  wxPen(const wxBitmap& stipple, int width);
-  inline wxPen(const wxPen& pen) { Ref(pen); }
-  ~wxPen();
-
-  inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-  inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-  // Override in order to recreate the pen
-  void SetColour(const wxColour& col) ;
-  void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
-
-  void SetWidth(int width)  ;
-  void SetStyle(int style)  ;
-  void SetStipple(const wxBitmap& stipple)  ;
-  void SetDashes(int nb_dashes, const wxDash *dash)  ;
-  void SetJoin(int join)  ;
-  void SetCap(int cap)  ;
-
-  inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-  inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-  inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-  inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-  inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const
-  {
-    *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
-    return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
-  }
-  inline int GetDashCount() const { return (M_PENDATA->m_nbDash); }
-  inline wxDash* GetDash() const { return (wxDash*)M_PENDATA->m_dash; }
-
-  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
-
-// Implementation
-
-  // Useful helper: create the brush resource
-  bool RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+    wxPen();
+    wxPen(const wxColour& col, int width, int style);
+    wxPen(const wxBitmap& stipple, int width);
+    inline wxPen(const wxPen& pen) { Ref(pen); }
+    ~wxPen();
+    
+    inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
+    inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
+    inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
+    
+    virtual bool Ok() const { return (m_refData != NULL) ; }
+    
+    // Override in order to recreate the pen
+    void SetColour(const wxColour& col) ;
+    void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+    
+    void SetWidth(int width)  ;
+    void SetStyle(int style)  ;
+    void SetStipple(const wxBitmap& stipple)  ;
+    void SetDashes(int nb_dashes, const wxDash *dash)  ;
+    void SetJoin(int join)  ;
+    void SetCap(int cap)  ;
+    
+    inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
+    inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
+    inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
+    inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
+    inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+    inline int GetDashes(wxDash **ptr) const
+    {
+        *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+        return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+    }
+    inline int GetDashCount() const { return (M_PENDATA->m_nbDash); }
+    inline wxDash* GetDash() const { return (wxDash*)M_PENDATA->m_dash; }
+    
+    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
+    
+    // Implementation
+    
+    // Useful helper: create the brush resource
+    bool RealizeResource();
+    
+    // When setting properties, we must make sure we're not changing
+    // another object
+    void Unshare();

 };
 
 #endif
 };
 
 #endif

-    // _WX_PEN_H_
+// _WX_PEN_H_