use (new) wxAcceleratorEntry::Create() instead of recently deprecated wxGetAccelFromS...

[wxWidgets.git] / include / wx / mac / carbon / dcclient.h

diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index 8e013140843e76165cd6cc2f03145bf2d7908f6d..993e01dacd16bf7a21070e8406ed98d0c0149f41 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

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

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


@@ -36,8 +32,8 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   wxWindowDC(wxWindow *win);
 
   ~wxWindowDC(void);
   wxWindowDC(wxWindow *win);
 
   ~wxWindowDC(void);

-  virtual void DoGetSize( int *width, int *height ) const;

   protected :
   protected :

+    virtual void DoGetSize( int *width, int *height ) const;

     wxWindow     *m_window;
 };
 
     wxWindow     *m_window;
 };
 


@@ -53,6 +49,8 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
   wxClientDC(wxWindow *win);
 
   ~wxClientDC(void);
   wxClientDC(wxWindow *win);
 
   ~wxClientDC(void);

+
+protected:

   virtual void DoGetSize( int *width, int *height ) const;
 };
 
   virtual void DoGetSize( int *width, int *height ) const;
 };
 


@@ -67,6 +65,8 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   wxPaintDC(wxWindow *win);
 
   ~wxPaintDC(void);
   wxPaintDC(wxWindow *win);
 
   ~wxPaintDC(void);

+
+protected:

   virtual void DoGetSize( int *width, int *height ) const;
 };
 
   virtual void DoGetSize( int *width, int *height ) const;
 };