Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently.

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

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index b40831a8942f18d2a1f98ec0ef352db4295dc37c..c34767f8ce5f50b6d8345ce2f89d202db0364653 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -24,11 +24,11 @@ class WXDLLEXPORT wxPalette;
 // Palette for one display
 class wxXPalette : public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxXPalette)
-
+    DECLARE_DYNAMIC_CLASS(wxXPalette)
+        
 public:
     wxXPalette();
-
+    
     WXDisplay*        m_display;
     int               m_pix_array_n;
     unsigned long*    m_pix_array;
@@ -42,7 +42,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();
-
+    
 protected:
     wxList  m_palettes;
 };
@@ -51,31 +51,31 @@ protected:
 
 class WXDLLEXPORT wxPalette: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxPalette)
-
+    DECLARE_DYNAMIC_CLASS(wxPalette)
+        
 public:
-  wxPalette();
-  wxPalette(const wxPalette& palette) { Ref(palette); }
-
-  wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  ~wxPalette();
-  bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const;
-  bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-  wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
-  bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
-
-  // Motif-specific
-  WXColormap GetXColormap(WXDisplay* display = NULL) const;
-  bool TransferBitmap(void *data, int depth, int size);
-  bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
-  unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
-  void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);
+    wxPalette();
+    wxPalette(const wxPalette& palette) { Ref(palette); }
+    
+    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    ~wxPalette();
+    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const;
+    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+    
+    virtual bool Ok() const { return (m_refData != NULL) ; }
+    
+    wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
+    bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
+    bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
+    
+    // Motif-specific
+    WXColormap GetXColormap(WXDisplay* display = NULL) const;
+    bool TransferBitmap(void *data, int depth, int size);
+    bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
+    unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
+    void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);
 };
 
 #endif
-    // _WX_PALETTE_H_
+// _WX_PALETTE_H_