Dnd constant name changes because names like Copy can be #defined by other

apps. Various other changes to stubs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/gtk.rsp

@@ -2,7 +2,6 @@ install-sh
 Makefile
 template.mak
 TODO.txt
-configure
 configure.in
 config.guess
 config.sub

distrib/msw/msw.rsp

@@ -1,6 +1,9 @@
 docs/msw/*.txt
 docs/licence.txt
 
+distrib/msw/*.rsp
+distrib/msw/*.bat
+
 src/makeb32.env
 src/makebcc.env
 src/makemsw.env

include/wx/defs.h

@@ -889,9 +889,10 @@ typedef int (__stdcall *WXFARPROC)();
 typedef void*           WXWindow;
 typedef void*           WXWidget;
 typedef void*           WXAppContext;
-typedef void*           WXMainColormap;
+typedef void*           WXColormap;
 typedef void            WXDisplay;
 typedef void            WXEvent;
+typedef void*           WXCursor;
 #endif
 
 #endif

include/wx/dnd.h

@@ -6,6 +6,7 @@
 #include "wx/msw/ole/droptgt.h"
 #include "wx/msw/ole/dataobj.h"
 #elif defined(__WXMOTIF__)
+#include "wx/motif/dnd.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dnd.h"
 #elif defined(__WXQT__)

include/wx/gtk/dnd.h

@@ -210,28 +210,28 @@ class wxFileDropTarget: public wxDropTarget
 // wxDropSource
 //-------------------------------------------------------------------------
 
+  enum wxDragResult
+  {
+    wxDragError,    // error prevented the d&d operation from completing
+    wxDragNone,     // drag target didn't accept the data
+    wxDragCopy,     // the data was successfully copied
+    wxDragMove,     // the data was successfully moved
+    wxDragCancel    // the operation was cancelled by user (not an error)
+  };
+
 class wxDropSource: public wxObject
 {
   public:
 
-  enum DragResult
-  {
-    Error,    // error prevented the d&d operation from completing
-    None,     // drag target didn't accept the data
-    Copy,     // the data was successfully copied
-    Move,     // the data was successfully moved
-    Cancel    // the operation was cancelled by user (not an error)
-  };
-
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     ~wxDropSource(void);
     
     void SetData( wxDataObject &data  );
-    DragResult DoDragDrop( bool bAllowMove = FALSE );
+    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
     
-    virtual bool GiveFeedback( DragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
 
   protected:
   
@@ -242,7 +242,7 @@ class wxDropSource: public wxObject
   
     GtkWidget     *m_widget;
     wxWindow      *m_window;
-    DragResult     m_retValue;
+    wxDragResult   m_retValue;
     wxDataObject  *m_data;
     
     wxCursor      m_defaultCursor;

include/wx/gtk1/dnd.h

@@ -210,28 +210,28 @@ class wxFileDropTarget: public wxDropTarget
 // wxDropSource
 //-------------------------------------------------------------------------
 
+  enum wxDragResult
+  {
+    wxDragError,    // error prevented the d&d operation from completing
+    wxDragNone,     // drag target didn't accept the data
+    wxDragCopy,     // the data was successfully copied
+    wxDragMove,     // the data was successfully moved
+    wxDragCancel    // the operation was cancelled by user (not an error)
+  };
+
 class wxDropSource: public wxObject
 {
   public:
 
-  enum DragResult
-  {
-    Error,    // error prevented the d&d operation from completing
-    None,     // drag target didn't accept the data
-    Copy,     // the data was successfully copied
-    Move,     // the data was successfully moved
-    Cancel    // the operation was cancelled by user (not an error)
-  };
-
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     ~wxDropSource(void);
     
     void SetData( wxDataObject &data  );
-    DragResult DoDragDrop( bool bAllowMove = FALSE );
+    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
     
-    virtual bool GiveFeedback( DragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
 
   protected:
   
@@ -242,7 +242,7 @@ class wxDropSource: public wxObject
   
     GtkWidget     *m_widget;
     wxWindow      *m_window;
-    DragResult     m_retValue;
+    wxDragResult   m_retValue;
     wxDataObject  *m_data;
     
     wxCursor      m_defaultCursor;

include/wx/msw/ole/dropsrc.h

@@ -26,6 +26,15 @@
 class wxIDropSource;
 class wxDataObject;
 
+enum wxDragResult
+  {
+    wxDragError,    // error prevented the d&d operation from completing
+    wxDragNone,     // drag target didn't accept the data
+    wxDragCopy,     // the data was successfully copied
+    wxDragMove,     // the data was successfully moved
+    wxDragCancel    // the operation was cancelled by user (not an error)
+  };
+
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
@@ -33,15 +42,6 @@ class wxDataObject;
 class wxDropSource
 {
 public:
-  enum DragResult
-  {
-    Error,    // error prevented the d&d operation from completing
-    None,     // drag target didn't accept the data
-    Copy,     // the data was successfully copied
-    Move,     // the data was successfully moved
-    Cancel    // the operation was cancelled by user (not an error)
-  };
-
   // ctors: if you use default ctor you must call SetData() later!
   // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
   //     compatibility
@@ -54,12 +54,12 @@ public:
 
   // do it (call this in response to a mouse button press, for example)
   // params: if bAllowMove is false, data can be only copied
-  DragResult DoDragDrop(bool bAllowMove = FALSE);
+  wxDragResult DoDragDrop(bool bAllowMove = FALSE);
 
   // overridable: you may give some custom UI feedback during d&d operation
   // in this function (it's called on each mouse move, so it shouldn't be too
   // slow). Just return false if you want default feedback.
-  virtual bool GiveFeedback(DragResult effect, bool bScrolling);
+  virtual bool GiveFeedback(wxDragResult effect, bool bScrolling);
 
 protected:
   void Init();
@@ -70,4 +70,4 @@ private:
   wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 };
 
-#endif  //_WX_OLEDROPSRC_H
+#endif  //_WX_OLEDROPSRC_H

include/wx/msw/window.h

@@ -350,6 +350,7 @@ public:
   inline virtual void SetDefaultItem(wxButton *but);
 
   virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
+  inline virtual wxAcceleratorTable& GetAcceleratorTable() const { return (wxAcceleratorTable&) m_acceleratorTable; }
 
   // Override to define new behaviour for default action (e.g. double clicking
   // on a listbox)

include/wx/stubs/dnd.h

@@ -205,28 +205,28 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
 // wxDropSource
 //-------------------------------------------------------------------------
 
+enum wxDragResult
+  {
+    wxDragError,    // error prevented the d&d operation from completing
+    wxDragNone,     // drag target didn't accept the data
+    wxDragCopy,     // the data was successfully copied
+    wxDragMove,     // the data was successfully moved
+    wxDragCancel    // the operation was cancelled by user (not an error)
+  };
+
 class WXDLLEXPORT wxDropSource: public wxObject
 {
   public:
 
-  enum DragResult
-  {
-    Error,    // error prevented the d&d operation from completing
-    None,     // drag target didn't accept the data
-    Copy,     // the data was successfully copied
-    Move,     // the data was successfully moved
-    Cancel    // the operation was cancelled by user (not an error)
-  };
-
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     ~wxDropSource(void);
     
     void SetData( wxDataObject &data  );
-    DragResult DoDragDrop( bool bAllowMove = FALSE );
+    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
     
-    virtual bool GiveFeedback( DragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
 
   protected:
   

include/wx/stubs/frame.h

@@ -128,8 +128,6 @@ public:
 
   virtual void Maximize(bool maximize);
 
-  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
-
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
@@ -147,7 +145,6 @@ protected:
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;
   wxToolBar *           m_frameToolBar ;
-  wxAcceleratorTable    m_acceleratorTable;
 
   DECLARE_EVENT_TABLE()
 };

include/wx/stubs/window.h

@@ -26,6 +26,7 @@
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/region.h"
+#include "wx/accel.h"
 
 #define wxKEY_SHIFT     1
 #define wxKEY_CTRL      2
@@ -255,6 +256,9 @@ public:
   inline int GetId() const;
   inline void SetId(int id);
 
+  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
+  inline virtual wxAcceleratorTable& GetAcceleratorTable() const { return (wxAcceleratorTable&) m_acceleratorTable; }
+
   // Make the window modal (all other windows unresponsive)
   virtual void MakeModal(bool modal);
 
@@ -477,6 +481,7 @@ protected:
   wxColour              m_foregroundColour ;
   wxColour              m_defaultBackgroundColour;
   wxColour              m_defaultForegroundColour;
+  wxAcceleratorTable    m_acceleratorTable;
 
 #if USE_DRAG_AND_DROP
   wxDropTarget         *m_pDropTarget;    // the current drop target or NULL

include/wx/taskbar.h

@@ -4,6 +4,7 @@
 #if defined(__WXMSW__)
 #include "wx/msw/taskbar.h"
 #elif defined(__WXMOTIF__)
+#include "wx/motif/taskbar.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXQT__)
 #elif defined(__WXMAC__)

include/wx/tbarsmpl.h

@@ -24,6 +24,8 @@
 #include "wx/list.h"
 #include "wx/tbarbase.h"
 
+class WXDLLEXPORT wxMemoryDC;
+
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;

include/wx/toolbar.h

@@ -11,6 +11,10 @@
 #   include "wx/msw/tbarmsw.h"
 #   define wxToolBar wxToolBarMSW
 #   define sm_classwxToolBar sm_classwxToolBarMSW
+#elif defined(__WXMOTIF__)
+#   include "wx/tbarsmpl.h"
+#   define wxToolBar wxToolBarSimple
+#   define sm_classwxToolBar sm_classwxToolBarSimple
 #elif defined(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"
 #elif defined(__WXQT__)

include/wx/utils.h

@@ -271,11 +271,9 @@ char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxStrin
 
 // X only
 #ifdef __X__
-// Get X display: often needed in the wxWindows implementation.
+WXDisplay *wxGetDisplay();
-Display *wxGetDisplay(void);
-/* Matthew Flatt: Added wxSetDisplay and wxGetDisplayName */
 bool wxSetDisplay(const wxString& display_name);
-wxString wxGetDisplayName(void);
+wxString wxGetDisplayName();
 #endif
 
 #ifdef __X__

samples/dnd/dnd.cpp

@@ -302,11 +302,11 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
     const char *pc;
 
     switch ( dragSource.DoDragDrop(TRUE) ) {
-      case wxDropSource::Error:   pc = "Error!";    break;
+      case wxDragError:   pc = "Error!";    break;
-      case wxDropSource::None:    pc = "Nothing";   break;
+      case wxDragNone:    pc = "Nothing";   break;
-      case wxDropSource::Copy:    pc = "Copied";    break;
+      case wxDragCopy:    pc = "Copied";    break;
-      case wxDropSource::Move:    pc = "Moved";     break;
+      case wxDragMove:    pc = "Moved";     break;
-      case wxDropSource::Cancel:  pc = "Cancelled"; break;
+      case wxDragCancel:  pc = "Cancelled"; break;
       default:                    pc = "Huh?";      break;
     }
 

samples/minimal/makefile.unx

@@ -9,8 +9,9 @@
 #
 # Makefile for minimal example (UNIX).
 
-include ../../src/makeprog.env
-
 PROGRAM=minimal
 
 OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

src/common/gdicmn.cpp

@@ -29,6 +29,7 @@
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"
+#include "wx/app.h"
 
 #include "wx/log.h"
 #include <string.h>
@@ -37,6 +38,10 @@
 #include <windows.h>
 #endif
 
+#ifdef __WXMOTIF__
+#include <Xm/Xm.h>
+#endif
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxColourDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
@@ -283,16 +288,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     XColor xcolour;
 
 #ifdef __WXMOTIF__
-    Display *display = XtDisplay(wxTheApp->topLevel) ;
+    Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
-#endif
-#ifdef __XVIEW__
-    Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);
-    Xv_opaque root_window = xv_get(screen, XV_ROOT);
-    Display *display = (Display *)xv_get(root_window, XV_DISPLAY);
 #endif
 
     /* MATTHEW: [4] Use wxGetMainColormap */
-    if (!XParseColor(display, wxGetMainColormap(display), colour,&xcolour))
+    if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
       return NULL;
 
     unsigned char r = (unsigned char)(xcolour.red >> 8);
@@ -340,7 +340,8 @@ void wxInitializeStockObjects ()
 #ifdef __WXMOTIF__
 #endif
 #ifdef __X__
-  wxFontPool = new XFontPool;
+  // TODO
+  //  wxFontPool = new XFontPool;
 #endif
 
   wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
@@ -604,12 +605,12 @@ wxFont *wxFontList::
 	  each_font->GetStyle () == Style &&
 	  each_font->GetWeight () == Weight &&
 	  each_font->GetUnderlined () == underline &&
-#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
+	  //#if defined(__X__)
-	  each_font->GetFontId () == FamilyOrFontId) /* New font system */
+	  //	  each_font->GetFontId () == FamilyOrFontId) /* New font system */
-#else
+	  //#else
 	  each_font->GetFamily () == FamilyOrFontId &&
           (!each_font->GetFaceName() || each_font->GetFaceName() == Face))
-#endif
+	//#endif
 	return each_font;
     }
   wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);

src/common/postscrp.cpp

@@ -71,6 +71,11 @@
 
 #endif
 
+#ifdef __WXMOTIF__
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#endif
+
 #ifdef __WXMSW__
 
 #ifdef DrawText
@@ -1447,13 +1452,16 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
 #else  
 
 #ifdef __WXMOTIF__
-  d = source->display;
+  // TODO. for now, use global display
+  //  d = source->display;
+  d = (Display*) wxGetDisplay();
 #else
-  d = wxGetDisplay();
+  d = (Display*) wxGetDisplay();
 #endif
 
-  cm = wxGetMainColormap(d);
+  cm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) d);
-  image = XGetImage(d, source->pixmap, x, y, width, height, AllPlanes, ZPixmap);
+  // TODO - implement GetPixmap() and uncomment this line
+  //  image = XGetImage(d, source->GetPixmap(), x, y, width, height, AllPlanes, ZPixmap);
   
 #endif
 
@@ -2144,8 +2152,8 @@ int wxPostScriptPrintDialog::ShowModal (void)
       StringToLong (WXSTRINGCAST text4->GetValue (), &wxThePrintSetupData->printerTranslateY);
 
 #ifdef __X__
-      wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ());
+      //      wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ());
-      wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ());
+      //      wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ());
 #endif
 
       wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? PS_LANDSCAPE : PS_PORTRAIT));

src/common/socket.cpp

@@ -117,7 +117,7 @@
 #endif
 
 #ifdef __WXMOTIF__
-#define wxAPP_CONTEXT wxTheApp->appContext
+#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
 #endif
 
 #ifdef __WINDOWS__

src/gtk/dnd.cpp

@@ -158,7 +158,7 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
   
   delete ptr;
   
-  source->m_retValue = wxDropSource::Copy;
+  source->m_retValue = wxDragCopy;
 }
 
 wxDropSource::wxDropSource( wxWindow *win )
@@ -170,7 +170,7 @@ wxDropSource::wxDropSource( wxWindow *win )
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
   
   m_data = (wxDataObject *) NULL;
-  m_retValue = Cancel;
+  m_retValue = wxDragCancel;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );
@@ -183,7 +183,7 @@ wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
   m_window = win;
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  m_retValue = Cancel;
+  m_retValue = wxDragCancel;
   
   m_data = &data;
 
@@ -203,15 +203,15 @@ wxDropSource::~wxDropSource(void)
   g_blockEventsOnDrag = FALSE;
 }
    
-wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {
-  if (gdk_dnd.dnd_grabbed) return (wxDropSource::DragResult) None;
+  if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone;
-  if (gdk_dnd.drag_really) return (wxDropSource::DragResult) None;
+  if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone;
   
   wxASSERT_MSG( m_data, "wxDragSource: no data" );
   
-  if (!m_data) return (wxDropSource::DragResult) None;
+  if (!m_data) return (wxDragResult) wxDragNone;
-  if (m_data->GetDataSize() == 0) return (wxDropSource::DragResult) None;
+  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
   
   GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
   

src/gtk1/dnd.cpp

@@ -158,7 +158,7 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
   
   delete ptr;
   
-  source->m_retValue = wxDropSource::Copy;
+  source->m_retValue = wxDragCopy;
 }
 
 wxDropSource::wxDropSource( wxWindow *win )
@@ -170,7 +170,7 @@ wxDropSource::wxDropSource( wxWindow *win )
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
   
   m_data = (wxDataObject *) NULL;
-  m_retValue = Cancel;
+  m_retValue = wxDragCancel;
 
   m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
   m_goaheadCursor = wxCursor( wxCURSOR_HAND );
@@ -183,7 +183,7 @@ wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
   m_window = win;
   m_widget = win->m_widget;
   if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  m_retValue = Cancel;
+  m_retValue = wxDragCancel;
   
   m_data = &data;
 
@@ -203,15 +203,15 @@ wxDropSource::~wxDropSource(void)
   g_blockEventsOnDrag = FALSE;
 }
    
-wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {
-  if (gdk_dnd.dnd_grabbed) return (wxDropSource::DragResult) None;
+  if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone;
-  if (gdk_dnd.drag_really) return (wxDropSource::DragResult) None;
+  if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone;
   
   wxASSERT_MSG( m_data, "wxDragSource: no data" );
   
-  if (!m_data) return (wxDropSource::DragResult) None;
+  if (!m_data) return (wxDragResult) wxDragNone;
-  if (m_data->GetDataSize() == 0) return (wxDropSource::DragResult) None;
+  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
   
   GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
   

src/msw/ole/dropsrc.cpp

@@ -121,13 +121,13 @@ STDMETHODIMP wxIDropSource::QueryContinueDrag(BOOL fEscapePressed,
 // Notes   : default implementation is ok in more than 99% of cases
 STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect)
 {
-  wxDropSource::DragResult effect;
+  wxDragResult effect;
   if ( dwEffect & DROPEFFECT_COPY )
-    effect = wxDropSource::Copy;
+    effect = wxDragCopy;
   else if ( dwEffect & DROPEFFECT_MOVE )
-    effect = wxDropSource::Move;
+    effect = wxDragMove;
   else
-    effect = wxDropSource::None;
+    effect = wxDragNone;
 
   if ( m_pDropSource->GiveFeedback(effect,
                                    (dwEffect & DROPEFFECT_SCROLL) != 0 ) )
@@ -173,12 +173,12 @@ wxDropSource::~wxDropSource()
 
 // Name    : DoDragDrop
 // Purpose : start drag and drop operation
-// Returns : DragResult - the code of performed operation
+// Returns : wxDragResult - the code of performed operation
 // Params  : [in] bool bAllowMove: if false, only copy is allowed
 // Notes   : you must call SetData() before if you had used def ctor
-wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
+wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
 {
-  wxCHECK_MSG( m_pData != NULL, None, "No data in wxDropSource!" );
+  wxCHECK_MSG( m_pData != NULL, wxDragNone, "No data in wxDropSource!" );
 
   DWORD dwEffect;
   HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), 
@@ -188,23 +188,23 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
                             &dwEffect);
 
   if ( hr == DRAGDROP_S_CANCEL ) {
-    return Cancel;
+    return wxDragCancel;
   }
   else if ( hr == DRAGDROP_S_DROP ) {
     if ( dwEffect & DROPEFFECT_COPY ) {
-      return Copy;
+      return wxDragCopy;
     }
     else if ( dwEffect & DROPEFFECT_MOVE ) {
       // consistency check: normally, we shouldn't get "move" at all
       // here if !bAllowMove, but in practice it does happen quite often
       if ( bAllowMove )
-        return Move;
+        return wxDragMove;
       else
-        return Copy;
+        return wxDragCopy;
     }
     else {
       // not copy or move
-      return None;
+      return wxDragNone;
     }
   }
   else {
@@ -216,7 +216,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
       wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr);
     }
 
-    return Error;
+    return wxDragError;
   }
 }
 
@@ -226,9 +226,9 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
 // Params  : [in] DragResult effect - what would happen if we dropped now
 //           [in] bool bScrolling   - true if target is scrolling    
 // Notes   : here we just leave this stuff for default implementation
-bool wxDropSource::GiveFeedback(DragResult effect, bool bScrolling)
+bool wxDropSource::GiveFeedback(wxDragResult effect, bool bScrolling)
 {
   return FALSE;
 }
 
-#endif  //USE_DRAG_AND_DROP
+#endif  //USE_DRAG_AND_DROP

src/stubs/dnd.cpp

@@ -125,9 +125,9 @@ wxDropSource::~wxDropSource(void)
 {
 };
    
-wxDropSource::DragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {
     // TODO
-    return Error;
+    return wxDragError;
 };
 

src/stubs/frame.cpp

@@ -180,11 +180,6 @@ void wxFrame::SetIcon(const wxIcon& icon)
   // TODO
 }
 
-void wxFrame::SetAcceleratorTable(const wxAcceleratorTable& accel)
-{
-    m_acceleratorTable = accel;
-}
-
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)
 {

src/stubs/window.cpp

@@ -1172,6 +1172,11 @@ void wxWindow::SetValidator(const wxValidator& validator)
 		m_windowValidator->SetWindow(this) ;
 }
 
+void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
+{
+    m_acceleratorTable = accel;
+}
+
 // Find a window by id or name
 wxWindow *wxWindow::FindWindow(long id)
 {