[ 1522987 ] wxComboCtrl crashes if TAB is pressed while popup is open

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

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index f134955bc4d67f8d1ef9128c98a8100a431c164c..436f02b208077170c2b5985a0a7c39b43cebb4fc 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


@@ -8,14 +8,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_PALETTE_H__
 #define __WX_PALETTE_H__
 
 #ifndef __WX_PALETTE_H__
 #define __WX_PALETTE_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "palette.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"


@@ -39,15 +34,13 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase
 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();

-    wxPalette& operator = (const wxPalette& palette);

     bool operator == (const wxPalette& palette) const;
     bool operator != (const wxPalette& palette) const;
     virtual bool Ok() const;
 
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     bool operator == (const wxPalette& palette) const;
     bool operator != (const wxPalette& palette) const;
     virtual bool Ok() const;
 
     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
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     // implementation