corrected the direction of comparisons between wxString and char/wxChar strings

[wxWidgets.git] / include / wx / os2 / dc.h

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index 89377fd23c7c44c3257e10ecd85a8cc7f22e37b0..01c4ff4a1cea2da4a62728eaf3c6923a11e321f1 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -13,7 +13,6 @@
 #define _WX_DC_H_
 
 #include "wx/defs.h"
 #define _WX_DC_H_
 
 #include "wx/defs.h"

-//#include "wx/dc.h"

 
 // ---------------------------------------------------------------------------
 // macros
 
 // ---------------------------------------------------------------------------
 // macros


@@ -85,7 +84,7 @@ public:
     wxDCCacheEntry( HPS   hPS
                    ,int   nDepth
                   );
     wxDCCacheEntry( HPS   hPS
                    ,int   nDepth
                   );

-    ~wxDCCacheEntry();
+    virtual ~wxDCCacheEntry();

 
     WXHBITMAP                       m_hBitmap;
     HPS                             m_hPS;
 
     WXHBITMAP                       m_hBitmap;
     HPS                             m_hPS;


@@ -101,7 +100,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
 
 public:
     wxDC(void);
 
 public:
     wxDC(void);

-    ~wxDC();
+    virtual ~wxDC();

 
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------


@@ -179,7 +178,6 @@ public:
     HPS             GetHPS(void) const { return m_hPS; }
     void            SetHPS(HPS hPS)
     {
     HPS             GetHPS(void) const { return m_hPS; }
     void            SetHPS(HPS hPS)
     {

-        HDC                         hDC = ::GpiQueryDevice(hPS);

         m_hPS = hPS;
     }
     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
         m_hPS = hPS;
     }
     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }


@@ -202,7 +200,7 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-    virtual void DoFloodFill( wxCoord         vX
+    virtual bool DoFloodFill( wxCoord         vX

                              ,wxCoord         vY
                              ,const wxColour& rCol
                              ,int             nStyle = wxFLOOD_SURFACE
                              ,wxCoord         vY
                              ,const wxColour& rCol
                              ,int             nStyle = wxFLOOD_SURFACE


@@ -302,17 +300,6 @@ protected:
                                      ,wxCoord vWidth
                                      ,wxCoord vHeight
                                     );
                                      ,wxCoord vWidth
                                      ,wxCoord vHeight
                                     );

-    virtual void DoGetClippingRegion( wxCoord* pX
-                                     ,wxCoord* pY
-                                     ,wxCoord* pWidth
-                                     ,wxCoord* pHeight)
-    {
-        GetClippingBox( pX
-                       ,pY
-                       ,pWidth
-                       ,pHeight
-                      );
-    }

 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight


@@ -333,6 +320,10 @@ protected:
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 

+#if wxUSE_PALETTE
+    void DoSelectPalette(bool bRealize = FALSE);
+    void InitializePalette(void);
+#endif // wxUSE_PALETTE

 
     //
     // common part of DoDrawText() and DoDrawRotatedText()
 
     //
     // common part of DoDrawText() and DoDrawRotatedText()