Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed obsolete files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@33849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-23 19:06:15 +00:00
parent 0bd8abe586
commit 9c8efca00a
19 changed files with 36 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/category.tex
View File

@@ -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}

6
include/wx/msw/wx.rc
View File

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

4
src/msw/checklst.cpp
View File

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

26
src/msw/choice.cpp
View File

@@ -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

4
src/msw/curico.cpp
View File

@@ -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"

4
src/msw/dde.cpp
View File

@@ -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)

4
src/msw/dib.cpp
View File

@@ -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

6
src/msw/joystick.cpp
View File

@@ -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

6
src/msw/listbox.cpp
View File

@@ -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) \

6
src/msw/listctrl.cpp
View File

@@ -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 <commctrl.h>
#include "wx/msw/missing.h"

1
src/msw/makefile.mic
View File

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

6
src/msw/minifram.cpp
View File

@@ -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)

10
src/msw/notebook.cpp
View File

@@ -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 <commctrl.h>
#include "wx/msw/winundef.h"

6
src/msw/tabctrl.cpp
View File

@@ -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 <commctrl.h>
#include "wx/msw/dib.h"
#include "wx/tabctrl.h"

6
src/msw/taskbar.cpp
View File

@@ -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

6
src/msw/tbar95.cpp
View File

@@ -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
#include <commctrl.h>
#if !defined(CCS_VERT)
#define CCS_VERT 0x00000080L

8
src/msw/treectrl.cpp
View File

@@ -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
#include <commctrl.h>
// Bug in headers, sometimes
#ifndef TVIS_FOCUSED

6
src/msw/wave.cpp
View File

@@ -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
#include <mmsystem.h>
wxWave::wxWave()
: m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)

10
src/msw/window.cpp
View File

@@ -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
#include <commctrl.h>
// ----------------------------------------------------------------------------
// standard constants not available with all compilers/headers