Removed obsolete files

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

docs/latex/wx/category.tex

@@ -430,7 +430,7 @@ facilities.
 \twocolitem{\helpref{wxDataObject}{wxdataobject}}{Data object class}
 \twocolitem{\helpref{wxDataFormat}{wxdataformat}}{Represents a data format}
 \twocolitem{\helpref{wxTextDataObject}{wxtextdataobject}}{Text data object class}
-\twocolitem{\helpref{wxFileDataObject}{wxtextdataobject}}{File data object class}
+\twocolitem{\helpref{wxFileDataObject}{wxfiledataobject}}{File data object class}
 \twocolitem{\helpref{wxBitmapDataObject}{wxbitmapdataobject}}{Bitmap data object class}
 \twocolitem{\helpref{wxCustomDataObject}{wxcustomdataobject}}{Custom data object class}
 \twocolitem{\helpref{wxClipboard}{wxclipboard}}{Clipboard class}

include/wx/msw/wx.rc

@@ -29,11 +29,7 @@
 // Version: $Id$
 /////////////////////////////////////////////////////////////////////////////
 
-#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
-	#include <wx/msw/gnuwin32/winresrc.h>
-#else
 #include <windows.h>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 //

src/msw/checklst.cpp

@@ -50,10 +50,6 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#if defined(__GNUWIN32_OLD__)
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------

src/msw/choice.cpp

@@ -300,7 +300,19 @@ void wxChoice::DoMoveWindow(int x, int y, int width, int height)
     if ( width < 0 )
         return;
 
+    // To work around a Windows bug (see "Bug in Windows Combobox" thread in Google Groups)
+    // we have to reset the selection if it was accidentally selected in the size.
+    DWORD oldSelStart = 0;
+    DWORD oldSelEnd = 0;
+    DWORD newSelStart = 0;
+    DWORD newSelEnd = 0;
+
     wxControl::DoMoveWindow(x, y, width, height);
+
+    if (oldSelStart != newSelStart || oldSelEnd != newSelEnd)
+    {
+        ::SendMessage(GetHwnd(), CB_SETEDITSEL, (WPARAM) 0, (LPARAM) MAKELPARAM(oldSelStart, oldSelEnd));
+    }
 }
 
 void wxChoice::DoSetSize(int x, int y,
@@ -313,7 +325,21 @@ void wxChoice::DoSetSize(int x, int y,
     // the _displayed_ size (NOT the drop down menu size) so
     // setting-getting-setting size would not work.
 
+    // To work around a Windows bug (see "Bug in Windows Combobox" thread in Google Groups)
+    // we have to reset the selection if it was accidentally selected in the size.
+    DWORD oldSelStart = 0;
+    DWORD oldSelEnd = 0;
+    DWORD newSelStart = 0;
+    DWORD newSelEnd = 0;
+
+    ::SendMessage(GetHwnd(), CB_GETEDITSEL, (WPARAM) & oldSelStart, (LPARAM) & oldSelEnd);
+
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
+
+    if (oldSelStart != newSelStart || oldSelEnd != newSelEnd)
+    {
+        ::SendMessage(GetHwnd(), CB_SETEDITSEL, (WPARAM) 0, (LPARAM) MAKELPARAM(oldSelStart, oldSelEnd));
+    }
 }
 
 wxSize wxChoice::DoGetBestSize() const

src/msw/curico.cpp

@@ -31,10 +31,6 @@
 #include <winuser.h>
 #endif
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 #include "wx/wxchar.h"
 #include "wx/msw/curicop.h"
 #include "wx/msw/curico.h"

src/msw/dde.cpp

@@ -50,10 +50,6 @@
 #define PCONVCONTEXT CONVCONTEXT*
 #endif
 
-#if defined(__TWIN32__) || defined(__GNUWIN32_OLD__)
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 // some compilers headers don't define this one (mingw32)
 #ifndef DMLERR_NO_ERROR
     #define DMLERR_NO_ERROR (0)

src/msw/dib.cpp

@@ -48,10 +48,6 @@
 
 #include "wx/msw/dib.h"
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 #ifndef SEEK_CUR
 /* flags for _lseek */
 #define        SEEK_CUR 1

src/msw/joystick.cpp

@@ -32,12 +32,6 @@
 typedef UINT MMRESULT;
 #endif
 
-#ifndef __TWIN32__
-#ifdef __GNUWIN32_OLD__
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
-
 // Why doesn't BC++ have joyGetPosEx?
 #if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__)
 #define NO_JOYGETPOSEX

src/msw/listbox.cpp

@@ -49,12 +49,6 @@
     #include  "wx/ownerdrw.h"
 #endif
 
-#ifndef __TWIN32__
-    #ifdef __GNUWIN32_OLD__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
-#endif
-
 #ifdef __WXWINE__
   #ifndef ListBox_SetItemData
     #define ListBox_SetItemData(hwndCtl, index, data) \

src/msw/listctrl.cpp

@@ -45,11 +45,7 @@
 
 #include "wx/msw/private.h"
 
-#if ((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
-    #include "wx/msw/gnuwin32/extra.h"
-#else
 #include <commctrl.h>
-#endif
 
 #include "wx/msw/missing.h"
 

src/msw/makefile.mic

@@ -1,6 +1,7 @@
 ##############################################################################
 # Microwindows template Makefile
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
+# Licence:  wxWindows Licence
 ##############################################################################
 
 TOP=$(MICROWINDOWS)

src/msw/minifram.cpp

@@ -45,12 +45,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 #include "wx/minifram.h"
 
-#ifndef __TWIN32__
-    #ifdef __GNUWIN32_OLD__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
-#endif
-
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

src/msw/notebook.cpp

@@ -43,15 +43,7 @@
 
 #include  <windowsx.h>  // for SetWindowFont
 
-#ifndef __TWIN32__
-    #ifdef __GNUWIN32_OLD__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
-#endif
-
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
 #include <commctrl.h>
-#endif
 
 #include "wx/msw/winundef.h"
 

src/msw/tabctrl.cpp

@@ -32,11 +32,7 @@
 
 #include <windows.h>
 
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
 #include <commctrl.h>
-#else
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
 
 #include "wx/msw/dib.h"
 #include "wx/tabctrl.h"

src/msw/taskbar.cpp

@@ -39,12 +39,6 @@
 #include "wx/msw/taskbar.h"
 #include "wx/msw/private.h"
 
-#ifndef __TWIN32__
-    #ifdef __GNUWIN32_OLD__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
-#endif
-
 #ifdef __SALFORDC__
     #include <shellapi.h>
 #endif

src/msw/tbar95.cpp

@@ -59,11 +59,7 @@
 
 #ifndef __TWIN32__
 
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
 #include <commctrl.h>
-#else
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
 
 #if !defined(CCS_VERT)
 #define CCS_VERT                0x00000080L

src/msw/treectrl.cpp

@@ -55,13 +55,7 @@
 #include "wx/msw/treectrl.h"
 #include "wx/msw/dragimag.h"
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
 #include <commctrl.h>
-#endif
 
 // Bug in headers, sometimes
 #ifndef TVIS_FOCUSED

src/msw/wave.cpp

@@ -33,11 +33,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
-    #include "wx/msw/gnuwin32/extra.h"
-#else
 #include <mmsystem.h>
-#endif
 
 wxWave::wxWave()
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)

src/msw/window.cpp

@@ -96,15 +96,7 @@
     #include <windowsx.h>
 #endif
 
-#if (!defined(__GNUWIN32_OLD__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__)
-    #ifdef __WIN95__
 #include <commctrl.h>
-    #endif
-#elif !defined(__WXMICROWIN__) // broken compiler
-    #ifndef __TWIN32__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
-#endif
 
 // ----------------------------------------------------------------------------
 // standard constants not available with all compilers/headers