Menu/toolbar event handling now tries the window with the focus first.

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

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 09fef319601d758f52568d76308b2e38439dfd16..581fc1648219fe2b334a97b121f16b910611f506 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -189,16 +189,16 @@ public:
   virtual void Clear() = 0;
 
   virtual void SetFont( const wxFont &font ) = 0;
-  virtual const wxFont& GetFont() const { return m_font; };
+  virtual wxFont& GetFont() const { return (wxFont&)m_font; };
 
   virtual void SetPen( const wxPen &pen ) = 0;
-  virtual const wxPen& GetPen() const { return m_pen; };
+  virtual wxPen& GetPen() const { return (wxPen&)m_pen; };
 
   virtual void SetBrush( const wxBrush &brush ) = 0;
-  virtual const wxBrush& GetBrush() const { return m_brush; };
+  virtual wxBrush& GetBrush() const { return (wxBrush&)m_brush; };
 
   virtual void SetBackground( const wxBrush &brush ) = 0;
-  virtual const wxBrush& GetBackground() const { return m_backgroundBrush; };
+  virtual wxBrush& GetBackground() const { return (wxBrush&)m_backgroundBrush; };
 
   virtual void SetLogicalFunction( int function ) = 0;
   virtual int GetLogicalFunction() { return m_logicalFunction; };
@@ -225,9 +225,16 @@ public:
   virtual long MinY() const { return m_minY; }
   virtual long MaxY() const { return m_maxY; }
 
+  // Size in device units
   virtual void GetSize( int* width, int* height ) const;
   inline wxSize GetSize(void) const { int w, h; GetSize(&w, &h); return wxSize(w, h); }
-  virtual void GetSizeMM( long* width, long* height ) const;
+
+  // Size in millimetres
+  virtual void GetSizeMM( int* width, int* height ) const;
+  inline wxSize GetSizeMM(void) const { int w, h; GetSizeMM(&w, &h); return wxSize(w, h); }
+
+  // Resolution in pixels per logical inch
+  virtual wxSize GetPPI(void) const;
 
   virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
   virtual void EndDoc() {}
@@ -339,7 +346,6 @@ public:
     bool         m_autoSetting;   // wxMSW only ?
     bool         m_dontDelete;    // wxMSW only ?
     bool         m_optimize;      // wxMSW only ?
-    wxString     m_filename;      // Not sure where this belongs.
 
     wxPen        m_pen;
     wxBrush      m_brush;