From b4da152ea3ec3968fb2f304b6ed73e0279c19506 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 7 Jan 2003 18:11:53 +0000 Subject: [PATCH] Removed old __WXWINE__ support (obsoleted by new __WINE__ symbol) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 2 +- include/wx/defs.h | 4 ++-- include/wx/msw/missing.h | 14 -------------- include/wx/msw/winundef.h | 2 +- include/wx/platform.h | 8 +------- src/common/cmndata.cpp | 14 -------------- src/common/file.cpp | 2 +- src/common/filefn.cpp | 4 ++-- src/common/mimecmn.cpp | 6 +++--- src/common/strconv.cpp | 10 ++-------- src/generic/dirctrlg.cpp | 6 ++---- src/msw/accel.cpp | 2 +- src/msw/colordlg.cpp | 2 +- src/msw/curico.cpp | 7 ------- src/msw/dcprint.cpp | 2 +- src/msw/dde.cpp | 4 ---- src/msw/dialup.cpp | 1 - src/msw/dib.cpp | 9 ++------- src/msw/dibutils.cpp | 14 -------------- src/msw/enhmeta.cpp | 12 ------------ src/msw/fdrepdlg.cpp | 2 +- src/msw/filedlg.cpp | 2 +- src/msw/fontdlg.cpp | 2 +- src/msw/fontenum.cpp | 10 ++-------- src/msw/listbox.cpp | 33 --------------------------------- src/msw/listctrl.cpp | 5 ----- src/msw/main.cpp | 8 ++------ src/msw/ole/automtn.cpp | 2 +- src/msw/ole/dataobj.cpp | 4 ---- src/msw/ole/uuid.cpp | 5 ----- src/msw/palette.cpp | 2 +- src/msw/textctrl.cpp | 19 +------------------ src/msw/utils.cpp | 6 ++---- src/msw/utilsexc.cpp | 9 ++------- src/msw/window.cpp | 4 ---- 35 files changed, 34 insertions(+), 204 deletions(-) diff --git a/configure.in b/configure.in index 568ac9c422..85cf1fb72a 100644 --- a/configure.in +++ b/configure.in @@ -2358,7 +2358,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" TOOLKIT=MSW GUIDIST=MSW_DIST - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WINE__" fi if test "$wxUSE_MOTIF" = 1; then diff --git a/include/wx/defs.h b/include/wx/defs.h index 261360c6f3..7216f53f05 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -254,7 +254,7 @@ typedef int wxWindowID; // ---------------------------------------------------------------------------- // stdcall is used for all functions called by Windows under Windows -#if defined(__WINDOWS__) && !defined(__WXWINE__) +#if defined(__WINDOWS__) #if defined(__GNUWIN32__) #define wxSTDCALL __attribute__((stdcall)) #else @@ -1931,7 +1931,7 @@ typedef WXHWND WXWidget; typedef unsigned int WXWPARAM; typedef long WXLPARAM; -#if !defined(__WIN32__) || defined(__GNUWIN32__) || defined(__WXWINE__) || defined(__WXMICROWIN__) +#if !defined(__WIN32__) || defined(__GNUWIN32__) || defined(__WXMICROWIN__) typedef int (*WXFARPROC)(); #else typedef int (__stdcall *WXFARPROC)(); diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index 631006ba34..eaff031b73 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -243,19 +243,5 @@ struct HH_AKLINK #define QS_ALLPOSTMESSAGE 0x0100 #endif -#ifdef __WXWINE__ -#define LV_ITEMA LVITEMA -#define LV_ITEMW LVITEMW -#define LV_DISPINFOA NMLVDISPINFOA -#define LV_DISPINFOW NMLVDISPINFOW - -#if wxUSE_UNICODE -#define LV_FINDINFO LVFINDINFOW -#else -#define LV_FINDINFO LVFINDINFOA -#endif - -#endif - #endif // _WX_MISSING_H_ diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index a3f6a6c99d..905e0a4438 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -341,7 +341,7 @@ // For WINE -#if defined(GetWindowStyle) || defined(__WXWINE__) +#if defined(GetWindowStyle) #undef GetWindowStyle #endif diff --git a/include/wx/platform.h b/include/wx/platform.h index 68e2f96480..c49935f8c4 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -39,16 +39,10 @@ #endif #endif -#ifdef __WXWINE__ - #ifndef __WIN32__ - #define __WIN32__ - #endif +#ifdef __WINE__ #ifndef __WIN95__ #define __WIN95__ #endif - #ifndef STRICT - #define STRICT - #endif #endif /* WINE */ #if defined(TWIN32) && !defined(__TWIN32__) diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index a9c7edd3b0..1483326154 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -56,11 +56,6 @@ #include #endif // Win16 - #ifdef __WXWINE__ - #include - #include - #endif - #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__) #include #include @@ -485,10 +480,7 @@ void wxPrintData::ConvertToNative() //// Orientation -#ifndef __WXWINE__ devMode->dmOrientation = m_printOrientation; -#endif - devMode->dmFields = DM_ORIENTATION; //// Collation @@ -520,7 +512,6 @@ void wxPrintData::ConvertToNative() devMode->dmFields |= DM_COLOR; -#ifndef __WXWINE__ //// Paper size if (m_paperId == wxPAPER_NONE) @@ -544,7 +535,6 @@ void wxPrintData::ConvertToNative() } } } -#endif //// Duplex @@ -613,12 +603,10 @@ void wxPrintData::ConvertFromNative() { LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode); -#ifndef __WXWINE__ //// Orientation if (devMode->dmFields & DM_ORIENTATION) m_printOrientation = devMode->dmOrientation; -#endif //// Collation @@ -658,7 +646,6 @@ void wxPrintData::ConvertFromNative() else m_colour = TRUE; -#ifndef __WXWINE__ //// Paper size // We don't know size of user defined paper and some buggy drivers @@ -712,7 +699,6 @@ void wxPrintData::ConvertFromNative() m_paperSize.y = 0; m_paperId = wxPAPER_NONE; } -#endif //// Duplex diff --git a/src/common/file.cpp b/src/common/file.cpp index 5c5dd58c9d..45e94a868d 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -28,7 +28,7 @@ #if wxUSE_FILE // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) +#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) #include #ifndef __SALFORDC__ diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 706a7d01cc..82b6636c6e 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -75,7 +75,7 @@ #include #include "wx/os2/private.h" #endif -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) && !defined(__WXWINE__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) #include #include @@ -1262,7 +1262,7 @@ bool wxMkdir(const wxString& dir, int perm) // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WINE__) || defined(__WXMICROWIN__) +#if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #elif defined(__WXPM__) if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 10bb885ac3..bffbdd0d96 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -486,7 +486,7 @@ wxMimeTypesManager::~wxMimeTypesManager() bool wxMimeTypesManager::Unassociate(wxFileType *ft) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) && !defined(__WINE__) +#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) return m_impl->Unassociate(ft); #else return ft->Unassociate(); @@ -596,7 +596,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes) void wxMimeTypesManager::Initialize(int mcapStyle, const wxString& sExtraDir) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) && !defined(__WINE__) +#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) EnsureImpl(); m_impl->Initialize(mcapStyle, sExtraDir); @@ -609,7 +609,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle, // and this function clears all the data from the manager void wxMimeTypesManager::ClearData() { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) && !defined(__WINE__) +#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) EnsureImpl(); m_impl->ClearData(); diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index a868a4a2ad..b15169ac54 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -784,12 +784,6 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n) #if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__) -#ifdef __WXWINE__ - #define WINE_CAST (WCHAR *) -#else - #define WINE_CAST -#endif - extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp class CP_CharSet : public wxCharacterSet @@ -809,7 +803,7 @@ public: 0, // flags (none) psz, // input string -1, // its length (NUL-terminated) - WINE_CAST buf, // output string + buf, // output string buf ? n : 0 // size of output buffer ); @@ -824,7 +818,7 @@ public: ( m_CodePage, // code page 0, // flags (none) - WINE_CAST psz, // input string + psz, // input string -1, // it is (wide) NUL-terminated buf, // output buffer buf ? n : 0, // and its size diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index d7ae88204d..09f07715ee 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -57,8 +57,7 @@ // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume // older releases don't, but it should be verified and the checks modified // accordingly. -#if !defined(__WXWINE__) && (!defined(__GNUWIN32__) || \ - (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)) +#if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) #include #include #include @@ -381,8 +380,7 @@ bool wxIsDriveAvailable(const wxString& dirName) if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); -#if defined(__WXWINE__) || (defined(__GNUWIN32__) && \ - !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)) +#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) success = wxPathExists(dirNameLower); #else int currentDrive = _getdrive(); diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index dd112f385a..88351417c7 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -96,7 +96,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) extern int wxCharCodeWXToMSW(int id, bool *isVirtual); // Create from an array -#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__) +#if !defined(__WIN16__) && !defined(__TWIN32__) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) { // Not available in WIN16 diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 2cae01b8c3..4466b024f4 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -44,7 +44,7 @@ #include -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) +#if !defined(__WIN32__) || defined(__SALFORDC__) #include #endif diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp index 39c6af6c19..34b895da03 100644 --- a/src/msw/curico.cpp +++ b/src/msw/curico.cpp @@ -16,14 +16,7 @@ #pragma hdrstop #endif -#ifndef __WXWINE__ #include -#endif - -#ifdef __WXWINE__ -#define NPSTR LPVOID -#endif - #include #if defined(__MWERKS__) diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 9ae94b59e1..6ca37febea 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -41,7 +41,7 @@ #include "wx/dcprint.h" #include "math.h" -#if wxUSE_COMMON_DIALOGS || defined(__WXWINE__) +#if wxUSE_COMMON_DIALOGS #include #endif diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index 6cf22d6b56..4487bd6a6d 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -46,10 +46,6 @@ #include #include -#ifdef __WXWINE__ -#define PCONVCONTEXT CONVCONTEXT* -#endif - #if defined(__TWIN32__) || defined(__GNUWIN32_OLD__) #include "wx/msw/gnuwin32/extra.h" #endif diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 595563115d..81ff0b817a 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -54,7 +54,6 @@ DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED) (!defined(__GNUWIN32__) || wxCHECK_W32API_VERSION(0, 5)) && \ !defined(__GNUWIN32_OLD__) && \ !defined(__WATCOMC__) && \ - !defined(__WXWINE__) && \ !defined(__WINE__) && \ (!defined(__VISUALC__) || (__VISUALC__ >= 1020)) diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 5267d91587..2eac920130 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -353,7 +353,7 @@ static HANDLE DibFromBitmap(HBITMAP hbm, DWORD biStyle, WORD biBits, HPALETTE hp static DWORD PASCAL lread(int fh, void far *pv, DWORD ul) { DWORD ulT = ul; -#if defined(WINNT) || defined(__WIN32__) || defined(__WIN32__) || defined(__WXWINE__) +#if defined(WINNT) || defined(__WIN32__) || defined(__WIN32__) BYTE *hp = (BYTE *) pv; #else BYTE huge *hp = (BYTE huge *) pv; @@ -383,7 +383,7 @@ static DWORD PASCAL lread(int fh, void far *pv, DWORD ul) static DWORD PASCAL lwrite(int fh, VOID FAR *pv, DWORD ul) { DWORD ulT = ul; -#if defined(WINNT) || defined(__WIN32__) || defined(__WIN32__) || defined(__WXWINE__) +#if defined(WINNT) || defined(__WIN32__) || defined(__WIN32__) BYTE *hp = (BYTE *) pv; #else BYTE huge *hp = (BYTE huge *) pv; @@ -639,9 +639,6 @@ static BOOL PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB, ****************************************************************************/ HPALETTE wxMakeDIBPalette(LPBITMAPINFOHEADER lpInfo) { -#ifdef __WXWINE__ - return (FALSE); -#else LPLOGPALETTE npPal; RGBQUAD far *lpRGB; HPALETTE hLogPal; @@ -689,8 +686,6 @@ HPALETTE wxMakeDIBPalette(LPBITMAPINFOHEADER lpInfo) */ else return((HPALETTE) GetStockObject(DEFAULT_PALETTE)); -#endif - } bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal) diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp index ff95213838..9f3051b408 100644 --- a/src/msw/dibutils.cpp +++ b/src/msw/dibutils.cpp @@ -32,12 +32,6 @@ #include "wx/msw/dibutils.h" -#ifdef __WXWINE__ -/* Why module.h? No longer finds this header. - #include -*/ -#endif - #if defined(__WIN32__) #if !defined(__MWERKS__) && !defined(__SALFORDC__) #include // for _fmemcpy() @@ -115,11 +109,7 @@ void wxClearSystemPalette(void) } // *** Create, select, realize, deselect, and delete the palette -#ifdef __WXWINE__ - ScreenDC = GetDC((HWND)NULL); -#else ScreenDC = GetDC(NULL); -#endif ScreenPalette = CreatePalette((LOGPALETTE *)&Palette); if (ScreenPalette) @@ -130,11 +120,7 @@ void wxClearSystemPalette(void) bOK = DeleteObject(ScreenPalette); } -#ifdef __WXWINE__ - nOK = ReleaseDC((HWND)NULL, ScreenDC); -#else nOK = ReleaseDC(NULL, ScreenDC); -#endif return; } diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp index b931e44bdf..6061f3deda 100644 --- a/src/msw/enhmeta.cpp +++ b/src/msw/enhmeta.cpp @@ -193,14 +193,7 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename, rect.bottom = height; // CreateEnhMetaFile() wants them in HIMETRIC -#ifdef __WXWINE__ - LONG r, b; - PixelToHIMETRIC(&r, &b); - rect.right = r; - rect.bottom = b; -#else PixelToHIMETRIC(&rect.right, &rect.bottom); -#endif pRect = ▭ } @@ -301,10 +294,6 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) } else { -#ifdef __WXWINE__ - wxFAIL_MSG( _T("unsupported format") ); - return FALSE; -#else wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") ); // convert to WMF @@ -346,7 +335,6 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) mfpict->yExt = sizeMF.y; PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt); -#endif } return TRUE; diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp index 27eb2be03d..20eb2bc503 100644 --- a/src/msw/fdrepdlg.cpp +++ b/src/msw/fdrepdlg.cpp @@ -37,7 +37,7 @@ #include "wx/msw/private.h" -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) +#if !defined(__WIN32__) || defined(__SALFORDC__) #include #endif diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 7df3db8961..b81e5ad940 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -43,7 +43,7 @@ #include "wx/msw/private.h" -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) +#if !defined(__WIN32__) || defined(__SALFORDC__) #include #endif diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index 40fc00a1a5..fdcbccd218 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -38,7 +38,7 @@ #include "wx/fontdlg.h" -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) +#if !defined(__WIN32__) || defined(__SALFORDC__) #include #include #endif diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp index 737d099c38..8ed53278ae 100644 --- a/src/msw/fontenum.cpp +++ b/src/msw/fontenum.cpp @@ -148,14 +148,8 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) return TRUE; } -#if defined(__WXWINE__) - #define wxFONTENUMPROC FONTENUMPROCEX -#elif (defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 )) - #if wxUSE_NORLANDER_HEADERS - #define wxFONTENUMPROC FONTENUMPROC - #else - #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) - #endif +#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS + #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) #else #define wxFONTENUMPROC FONTENUMPROC #endif diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index a274222a8a..59aeac9eea 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -36,12 +36,6 @@ #include -#ifdef __WXWINE__ - #if defined(GetWindowStyle) - #undef GetWindowStyle - #endif -#endif - #include "wx/dynarray.h" #include "wx/log.h" @@ -55,33 +49,6 @@ #endif #endif -#ifdef __WXWINE__ - #ifndef ListBox_SetItemData - #define ListBox_SetItemData(hwndCtl, index, data) \ - ((int)(DWORD)SendMessage((hwndCtl), LB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data))) - #endif - #ifndef ListBox_GetHorizontalExtent - #define ListBox_GetHorizontalExtent(hwndCtl) \ - ((int)(DWORD)SendMessage((hwndCtl), LB_GETHORIZONTALEXTENT, 0L, 0L)) - #endif - #ifndef ListBox_GetSelCount - #define ListBox_GetSelCount(hwndCtl) \ - ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELCOUNT, 0L, 0L)) - #endif - #ifndef ListBox_GetSelItems - #define ListBox_GetSelItems(hwndCtl, cItems, lpItems) \ - ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELITEMS, (WPARAM)(int)(cItems), (LPARAM)(int *)(lpItems))) - #endif - #ifndef ListBox_GetTextLen - #define ListBox_GetTextLen(hwndCtl, index) \ - ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXTLEN, (WPARAM)(int)(index), 0L)) - #endif - #ifndef ListBox_GetText - #define ListBox_GetText(hwndCtl, index, lpszBuffer) \ - ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer))) - #endif -#endif - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) // ============================================================================ diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index ee5bcf35af..15356ad7d9 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -119,12 +119,7 @@ private: #if wxUSE_WCHAR_T if ( (item.mask & LVIF_TEXT) && item.pszText ) { -#ifdef __WXWINE__ - // FIXME - m_buf = new wxWC2WXbuf(wxConvLocal.cWC2WX((const __wchar_t* ) item.pszText)); -#else m_buf = new wxWC2WXbuf(wxConvLocal.cWC2WX(item.pszText)); -#endif m_item->pszText = (wxChar*)m_buf->data(); } else diff --git a/src/msw/main.cpp b/src/msw/main.cpp index 00736a1394..9c99ed611c 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -72,15 +72,11 @@ HINSTANCE wxhInstance = 0; #if !defined(_WINDLL) -#if defined(__WXWINE__) - #define HINSTANCE HINSTANCE__* - - extern "C" -#elif defined(__TWIN32__) || defined(__WXMICROWIN__) +#if defined(__TWIN32__) || defined(__WXMICROWIN__) #define HINSTANCE HANDLE extern "C" -#endif // WINE +#endif int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index c5c830ff1f..9596ceea35 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -24,7 +24,7 @@ // Watcom C++ gives a linker error if this is compiled in. // With Borland C++, all samples crash if this is compiled in. -#if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__) && !defined(__WXWINE__) +#if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__) #define _FORCENAMELESSUNION #include "wx/log.h" diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 8661eaf36b..ded99292e6 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -55,10 +55,6 @@ #include "wx/msw/dib.h" -#ifdef __WXWINE__ -#define LPDROPFILES DROPFILES* -#endif - #ifndef CFSTR_SHELLURL #define CFSTR_SHELLURL _T("UniformResourceLocator") #endif diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp index 04f81a8385..f64ae4d358 100644 --- a/src/msw/ole/uuid.cpp +++ b/src/msw/ole/uuid.cpp @@ -136,10 +136,6 @@ void Uuid::Create() // set the value bool Uuid::Set(const wxChar *pc) { -#ifdef __WXWINE__ - wxFAIL_MSG(_T("UUid::Set not implemented")); - return FALSE; -#else // get UUID from string #ifdef _UNICODE if ( UuidFromString((unsigned short *)pc, &m_uuid) != RPC_S_OK) @@ -160,7 +156,6 @@ bool Uuid::Set(const wxChar *pc) UuidToCForm(); return TRUE; -#endif } // stores m_uuid in m_pszCForm in a format required by diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp index 48d8a76150..159975a963 100644 --- a/src/msw/palette.cpp +++ b/src/msw/palette.cpp @@ -73,7 +73,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre { UnRef(); -#if defined(__WXWINE__) || defined(__WXMICROWIN__) +#if defined(__WXMICROWIN__) return (FALSE); diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index e0e20bb683..ecc2831ac1 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -595,15 +595,6 @@ DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb) extern long wxEncodingToCodepage(wxFontEncoding encoding); // from utils.cpp -#ifdef __WXWINE__ -bool wxTextCtrl::StreamIn(const wxString& value, - wxFontEncoding WXUNUSED(encoding), - bool selectionOnly) -{ - return FALSE; -} -#else // !__WXWINE__ - #if wxUSE_UNICODE_MSLU bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding WXUNUSED(encoding), @@ -676,8 +667,6 @@ bool wxTextCtrl::StreamIn(const wxString& value, return TRUE; } -#endif // __WXWINE__/!__WXWINE__ - #endif // wxUSE_RICHEDIT void wxTextCtrl::WriteText(const wxString& value) @@ -715,7 +704,7 @@ void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly) } #endif // wxUSE_UNICODE_MSLU -#if !wxUSE_UNICODE && !defined(__WXWINE__) +#if !wxUSE_UNICODE // next check if the text we're inserting must be shown in a non // default charset -- this only works for RichEdit > 1.0 if ( GetRichVersion() > 1 ) @@ -1758,7 +1747,6 @@ void wxTextCtrl::OnRightClick(wxMouseEvent& event) bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { -#ifndef __WXWINE__ NMHDR *hdr = (NMHDR* )lParam; switch ( hdr->code ) { @@ -1845,7 +1833,6 @@ bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) } return TRUE; } -#endif // not processed, leave it to the base class return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result); @@ -1903,9 +1890,6 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour) bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) { -#ifdef __WXWINE__ - return FALSE; -#else if ( !IsRich() ) { // can't do it with normal text control @@ -2035,7 +2019,6 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) } return ok; -#endif } bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 271a75da76..b83e43d9b0 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -48,7 +48,7 @@ #include "wx/timer.h" -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) #include #ifndef __MWERKS__ @@ -78,7 +78,7 @@ #include #endif // USE_NET_API -#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) +#if defined(__WIN32__) && !defined(__WXMICROWIN__) #include #ifndef __GNUWIN32__ @@ -887,7 +887,6 @@ bool wxShutdown(wxShutdownFlags wFlags) bOK = ::OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken) != 0; -#ifndef __WXWINE__ if ( bOK ) { TOKEN_PRIVILEGES tkp; @@ -906,7 +905,6 @@ bool wxShutdown(wxShutdownFlags wFlags) // Cannot test the return value of AdjustTokenPrivileges. bOK = ::GetLastError() == ERROR_SUCCESS; } -#endif } if ( bOK ) diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 28fc5edfed..3db9fa1419 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -47,7 +47,7 @@ #include -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) #include #ifndef __MWERKS__ #include @@ -59,7 +59,7 @@ #include #endif -#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) +#if defined(__WIN32__) && !defined(__WXMICROWIN__) #include #ifndef __GNUWIN32__ @@ -347,10 +347,6 @@ wxPipeInputStream::~wxPipeInputStream() bool wxPipeInputStream::CanRead() const { - // FIXME -#ifdef __WXWINE__ - return FALSE; -#else // !Wine if ( !IsOpened() ) return FALSE; @@ -387,7 +383,6 @@ bool wxPipeInputStream::CanRead() const } return nAvailable != 0; -#endif // Wine/!Wine } size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index edb3390399..35603d9a01 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1463,14 +1463,10 @@ void wxWindowMSW::Refresh(bool eraseBack, const wxRect *rect) void wxWindowMSW::Update() { -#ifdef __WXWINE__ - ::UpdateWindow(GetHwnd()); -#else if ( !::UpdateWindow(GetHwnd()) ) { wxLogLastError(_T("UpdateWindow")); } -#endif #if defined(__WIN32__) && !defined(__WXMICROWIN__) // just calling UpdateWindow() is not enough, what we did in our WM_PAINT