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 fc4a1e35e2869cb5ecca0730d81d1353b4af730e..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/dc.h"
 #include "wx/region.h"
-#include "wx/dnd.h"
 #include "wx/accel.h"
 
 //-----------------------------------------------------------------------------
@@ -34,18 +32,29 @@
 extern const char *wxFrameNameStr;
 extern wxList wxTopLevelWindows;
 
+//-----------------------------------------------------------------------------
+// global function
+//-----------------------------------------------------------------------------
+
+wxWindow* wxGetActiveWindow();
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxLayoutConstraints;
 class wxSizer;
-class wxResourceTable;
-class wxItemResource;
-
+class wxDC;
 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)
@@ -120,10 +129,12 @@ public:
            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);
+#endif
 
   bool Close( bool force = FALSE );
   virtual bool Destroy();
@@ -166,7 +177,6 @@ public:
   { 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 );
@@ -261,6 +271,7 @@ public:
   virtual wxString GetLabel() const;
 
   void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
+  void OnKeyDown( wxKeyEvent &event );
 
   virtual bool IsShown() const;
 
@@ -285,8 +296,10 @@ public:
 
   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
+#if wxUSE_DRAG_AND_DROP
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
+#endif
 
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
@@ -302,22 +315,24 @@ public:
 
   // 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;
@@ -328,7 +343,9 @@ public:
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;
+#if wxUSE_DRAG_AND_DROP
   wxDropTarget        *m_dropTarget;
+#endif
   wxWindowID           m_windowId;
   wxCursor            *m_cursor;
   wxFont               m_font;