Partial Watcom C++ 10.6 support added (doesn't link for some reason)

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 339a9d610690ec8600c3ba5028b51fa45a2efb0a..fc4a1e35e2869cb5ecca0730d81d1353b4af730e 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -88,6 +88,16 @@ private:
     wxString  m_data;
 };
 
     wxString  m_data;
 };
 

+//-----------------------------------------------------------------------------
+// (debug)
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+void debug_focus_in( GtkWidget* widget, const char* name, const char* window );
+
+#endif
+

 //-----------------------------------------------------------------------------
 // wxWindow
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxWindow
 //-----------------------------------------------------------------------------


@@ -124,11 +134,23 @@ public:
   virtual void SetSize( int x, int y, int width, int height,
     int sizeFlags = wxSIZE_AUTO );
   virtual void SetSize( int width, int height );
   virtual void SetSize( int x, int y, int width, int height,
     int sizeFlags = wxSIZE_AUTO );
   virtual void SetSize( int width, int height );

+  

   virtual void Move( int x, int y );
   virtual void Move( int x, int y );

+  

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

+  wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
+  

   virtual void SetClientSize( int const width, int const height );
   virtual void SetClientSize( int const width, int const height );

+  

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

+  wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
+  

   virtual void GetPosition( int *x, int *y ) const;
   virtual void GetPosition( int *x, int *y ) const;

+  wxPoint GetPosition() const { int w, h; GetPosition(& w, & h); return wxPoint(w, h); }
+  
+  wxRect GetRect() const
+    { int x, y, w, h; GetPosition(& x, & y); GetSize(& w, & h); return wxRect(x, y, w, h); }
+    

   virtual void Centre( int direction = wxHORIZONTAL );
   inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
   virtual void Fit();
   virtual void Centre( int direction = wxHORIZONTAL );
   inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
   virtual void Fit();


@@ -151,9 +173,11 @@ public:
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   inline bool Enabled() const { return IsEnabled(); }
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   inline bool Enabled() const { return IsEnabled(); }

-  virtual void SetFocus();

   virtual bool OnClose();
 
   virtual bool OnClose();
 

+  virtual void SetFocus();
+  static wxWindow *FindFocus();
+  

   virtual void AddChild( wxWindow *child );
   wxList& GetChildren() { return m_children; }
 
   virtual void AddChild( wxWindow *child );
   wxList& GetChildren() { return m_children; }
 


@@ -192,6 +216,8 @@ public:
 
   void SetCursor( const wxCursor &cursor );
 
 
   void SetCursor( const wxCursor &cursor );
 

+  void WarpPointer(int x, int y);
+  

   virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
   virtual void Clear();
 
   virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
   virtual void Clear();
 


@@ -214,13 +240,13 @@ public:
                              const wxFont *theFont = (const wxFont *) NULL, bool use16 = FALSE) const;
 
   virtual void SetFont( const wxFont &font );
                              const wxFont *theFont = (const wxFont *) NULL, bool use16 = FALSE) const;
 
   virtual void SetFont( const wxFont &font );

-  virtual const wxFont& GetFont() { return m_font; }
+  virtual wxFont& GetFont() { return m_font; }

 
     // For backward compatibility
   inline virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
   inline virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
 
     // For backward compatibility
   inline virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
   inline virtual void SetLabelFont(const wxFont& font) { SetFont(font); }

-  inline virtual const wxFont& GetLabelFont() { return GetFont(); };
-  inline virtual const wxFont& GetButtonFont() { return GetFont(); };
+  inline virtual wxFont& GetLabelFont() { return GetFont(); };
+  inline virtual wxFont& GetButtonFont() { return GetFont(); };

 
   virtual void SetWindowStyleFlag( long flag );
   virtual long GetWindowStyleFlag() const;
 
   virtual void SetWindowStyleFlag( long flag );
   virtual long GetWindowStyleFlag() const;


@@ -331,6 +357,7 @@ public:
   GdkGC               *m_scrollGC;
   GtkStyle            *m_widgetStyle;
   bool                 m_isStaticBox;
   GdkGC               *m_scrollGC;
   GtkStyle            *m_widgetStyle;
   bool                 m_isStaticBox;

+  bool                 m_acceptsFocus;

 
   wxInsertChildFunction  m_insertCallback;
 
 
   wxInsertChildFunction  m_insertCallback;