Move SetDefaultTimeout to wxProtocol and set it to 60 seconds for both wxHTTP and...

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

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index 00c12217d6aff07a7c7b4cf6edd966098dd2acbe..31fde89c0428f1d5c566891019f20c668753e8d7 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.h
+// Name:        wx/mgl/palette.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11


@@ -20,35 +20,30 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 struct palette_t;
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 
 struct palette_t;
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPalette: public wxPaletteBase
+class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPalette)
-

 public:
     wxPalette();
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
 public:
     wxPalette();
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

-    wxPalette(const wxPalette& palette);
-    ~wxPalette();
-    wxPalette& operator = (const wxPalette& palette);
-    bool operator == (const wxPalette& palette) const;
-    bool operator != (const wxPalette& palette) const;
-    virtual bool Ok() const;
+    virtual ~wxPalette();

 
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
 
     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;
+    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;

     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     // implementation
     virtual int GetColoursCount() const;
 
     palette_t *GetMGLpalette_t() const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     // implementation
     virtual int GetColoursCount() const;
 
     palette_t *GetMGLpalette_t() const;

+
+    DECLARE_DYNAMIC_CLASS(wxPalette)

 };
 
 #endif // __WX_PALETTE_H__
 };
 
 #endif // __WX_PALETTE_H__