Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / dcscreen.h

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index 5f9538b4ce21408bf521cb7f66d0fad039e6dd71..83084aeadccac4b1be15e1a6b2c7dca50b6fc3b4 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.h
+// Name:        wx/gtk/dcscreen.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDCSCREENH__
-#define __GTKDCSCREENH__
+#ifndef _WX_GTKDCSCREEN_H_
+#define _WX_GTKDCSCREEN_H_

 
 #include "wx/dcscreen.h"
 #include "wx/gtk/dcclient.h"
 
 #include "wx/dcscreen.h"
 #include "wx/gtk/dcclient.h"


@@ -23,14 +23,12 @@ public:
     wxScreenDCImpl( wxScreenDC *owner );
     ~wxScreenDCImpl();
 
     wxScreenDCImpl( wxScreenDC *owner );
     ~wxScreenDCImpl();
 

-protected:

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

+private:

     void Init();
 
     void Init();
 

-private:

     DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
 };
 

-#endif // __GTKDCSCREENH__
-
+#endif // _WX_GTKDCSCREEN_H_