Changed floats to doubles in wxexpr.h; added a flag in accel.h (wxACCEL_NONE for

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 1ab4f69b508cc2dca8dc583f023c592c76c21f8a..716be466069ab46273e1cefc625e4b12382c8bb6 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -26,6 +26,7 @@
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/region.h"
+#include "wx/msw/accel.h"
 
 #define wxKEY_SHIFT     1
 #define wxKEY_CTRL      2
@@ -67,7 +68,7 @@ class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxValidator;
 
 #if USE_DRAG_AND_DROP
-class wxDropTarget;
+class WXDLLEXPORT wxDropTarget;
 #endif
 
 #if USE_WX_RESOURCES
@@ -348,6 +349,8 @@ public:
   inline virtual wxButton *GetDefaultItem(void) const;
   inline virtual void SetDefaultItem(wxButton *but);
 
+  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
+
   // Override to define new behaviour for default action (e.g. double clicking
   // on a listbox)
   virtual void OnDefaultAction(wxControl *initiatingItem);
@@ -588,6 +591,7 @@ public:
   ////////////////////////////////////////////////////////////////////////
   //// PROTECTED DATA
 protected:
+  wxAcceleratorTable    m_acceleratorTable;
   int                   m_windowId;
   long                  m_windowStyle;                         // Store the window's style
   wxEvtHandler *        m_windowEventHandler;  // Usually is 'this'