Better disabling of toolbars and menubars

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index fc4a1e35e2869cb5ecca0730d81d1353b4af730e..d26c7214ccc029115e85b8deb7d168c3b1574966 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();


@@ -285,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 );


@@ -328,7 +341,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;