1. registry files corresponding to the recent registry.h changes

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 82a4de7e781b872730adde6051e365f3def71a19..f7ca89a62db4cf7d3556319821000bbdee98f51c 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -22,9 +22,7 @@
 #include "wx/validate.h"
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/validate.h"
 #include "wx/cursor.h"
 #include "wx/font.h"

-#include "wx/dc.h"

 #include "wx/region.h"
 #include "wx/region.h"

-#include "wx/dnd.h"

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


@@ -34,18 +32,29 @@
 extern const char *wxFrameNameStr;
 extern wxList wxTopLevelWindows;
 
 extern const char *wxFrameNameStr;
 extern wxList wxTopLevelWindows;
 

+//-----------------------------------------------------------------------------
+// global function
+//-----------------------------------------------------------------------------
+
+wxWindow* wxGetActiveWindow();
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxLayoutConstraints;
 class wxSizer;
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxLayoutConstraints;
 class wxSizer;

-class wxResourceTable;
-class wxItemResource;
-
+class wxDC;

 class wxClientData;
 class wxVoidClientData;
 class wxWindow;
 class wxClientData;
 class wxVoidClientData;
 class wxWindow;

+#if wxUSE_WX_RESOURCES
+class wxResourceTable;
+class wxItemResource;
+#endif
+#if wxUSE_DRAG_AND_DROP
+class wxDropTarget;
+#endif

 
 //-----------------------------------------------------------------------------
 // callback definition for inserting a window (internal)
 
 //-----------------------------------------------------------------------------
 // callback definition for inserting a window (internal)


@@ -120,10 +129,12 @@ public:
            const wxString& name = wxPanelNameStr);
   virtual ~wxWindow();
 
            const wxString& name = wxPanelNameStr);
   virtual ~wxWindow();
 

+#if wxUSE_WX_RESOURCES

   virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName,
                                  const wxResourceTable *table = (const wxResourceTable *) NULL);
   virtual wxControl *CreateItem(const wxItemResource* childResource, const wxItemResource* parentResource,
                                  const wxResourceTable *table = (const wxResourceTable *) NULL);
   virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName,
                                  const wxResourceTable *table = (const wxResourceTable *) NULL);
   virtual wxControl *CreateItem(const wxItemResource* childResource, const wxItemResource* parentResource,
                                  const wxResourceTable *table = (const wxResourceTable *) NULL);

+#endif

 
   bool Close( bool force = FALSE );
   virtual bool Destroy();
 
   bool Close( bool force = FALSE );
   virtual bool Destroy();


@@ -134,11 +145,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();


@@ -154,7 +177,6 @@ public:
   { wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
 
   void OnSize( wxSizeEvent &event );
   { wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
 
   void OnSize( wxSizeEvent &event );

-  void OnIdle( wxIdleEvent& event );

 
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
 
   virtual bool Show( bool show );
   virtual void Enable( bool enable );


@@ -204,6 +226,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();
 


@@ -226,13 +250,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;


@@ -247,6 +271,7 @@ public:
   virtual wxString GetLabel() const;
 
   void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
   virtual wxString GetLabel() const;
 
   void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};

+  void OnKeyDown( wxKeyEvent &event );

 
   virtual bool IsShown() const;
 
 
   virtual bool IsShown() const;
 


@@ -271,8 +296,10 @@ public:
 
   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
 
   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 

+#if wxUSE_DRAG_AND_DROP

   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;

+#endif

 
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
 
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );


@@ -288,22 +315,24 @@ public:
 
   // implementation
 
 
   // implementation
 

-          void        PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
-                                   const wxSize &size, long style, const wxString &name );
-          void        PostCreation();
-  virtual GtkWidget  *GetConnectWidget();
-  virtual bool        IsOwnGtkWindow( GdkWindow *window );
-          void        ConnectWidget( GtkWidget *widget );
-
-          bool        HasVMT();
+  void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
+                    const wxSize &size, long style, const wxString &name );
+  void PostCreation();
+  
+  virtual GtkWidget* GetConnectWidget();
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+  void ConnectWidget( GtkWidget *widget );

 
 

-  virtual wxPoint     GetClientAreaOrigin() const;
-  virtual void        AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
+  bool HasVMT();

 
 

-          GtkStyle   *GetWidgetStyle();
-          void        SetWidgetStyle();
-  virtual void        ApplyWidgetStyle();
+  virtual wxPoint GetClientAreaOrigin() const;
+  virtual void AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );

 
 

+  GtkStyle *GetWidgetStyle();
+  void SetWidgetStyle();
+  virtual void ApplyWidgetStyle();
+  
+  virtual void OnInternalIdle();

 
   wxWindow            *m_parent;
   wxList               m_children;
 
   wxWindow            *m_parent;
   wxList               m_children;


@@ -314,7 +343,9 @@ public:
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;

+#if wxUSE_DRAG_AND_DROP

   wxDropTarget        *m_dropTarget;
   wxDropTarget        *m_dropTarget;

+#endif

   wxWindowID           m_windowId;
   wxCursor            *m_cursor;
   wxFont               m_font;
   wxWindowID           m_windowId;
   wxCursor            *m_cursor;
   wxFont               m_font;