From 7e5fed9cce221edd574eb1f1ff4e2dfd2d992c74 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 13 May 2005 11:58:24 +0000 Subject: [PATCH] Removed unnecessary declarations git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/wince/missing.h | 59 +++++++++++----------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h index 33bfc6eab3..6ae6ab26b7 100644 --- a/include/wx/msw/wince/missing.h +++ b/include/wx/msw/wince/missing.h @@ -39,51 +39,30 @@ inline BOOL IsIconic( HWND WXUNUSED(hWnd) ) #define TBSTYLE_NO_DROPDOWN_ARROW 0x0080 #endif -#if _WIN32_WCE >= 400 && !defined(SHCMBM_GETMENU) - -// aygshell.h missing from eVC 4 for some reason -// NB not missing from Pocket PC 2003, hence the test for SHCMBM_GETMENU - +#ifndef SHCMBM_GETMENU #define SHCMBM_GETMENU (WM_USER + 402) +#endif + +#ifndef SHCMBM_SETSUBMENU #define SHCMBM_SETSUBMENU (WM_USER + 400) // wparam == id of button, lParam == hmenu, return is old hmenu +#endif + +#ifndef SHCMBM_GETSUBMENU #define SHCMBM_GETSUBMENU (WM_USER + 401) // lParam == ID -#define SHCMBM_GETMENU (WM_USER + 402) // get the owning hmenu (as specified in the load resource) - -#define SHIDIF_DONEBUTTON 0x0001 -#define SHIDIF_SIZEDLG 0x0002 -#define SHIDIF_SIZEDLGFULLSCREEN 0x0004 -#define SHIDIF_SIPDOWN 0x0008 -#define SHIDIF_FULLSCREENNOMENUBAR 0x0010 -#define SHIDIF_EMPTYMENU 0x0020 - -#define SHFS_SHOWTASKBAR 0x0001 -#define SHFS_HIDETASKBAR 0x0002 -#define SHFS_SHOWSIPBUTTON 0x0004 -#define SHFS_HIDESIPBUTTON 0x0008 -#define SHFS_SHOWSTARTICON 0x0010 -#define SHFS_HIDESTARTICON 0x0020 - -typedef struct tagSHMENUBARINFO -{ - DWORD cbSize; // IN - Indicates which members of struct are valid - HWND hwndParent; // IN - DWORD dwFlags; // IN - Some features we want - UINT nToolBarId; // IN - Which toolbar are we using - HINSTANCE hInstRes; // IN - Instance that owns the resources - int nBmpId; - int cBmpImages; // IN - Count of bitmap images - HWND hwndMB; // OUT - COLORREF clrBk; // IN - background color of the menu bar (excluding sip) -} SHMENUBARINFO, *PSHMENUBARINFO; - -extern "C" -{ - BOOL SHFullScreen(HWND hwndRequester, DWORD dwState); +#endif - WINSHELLAPI BOOL SHCreateMenuBar(SHMENUBARINFO *pmbi); -} +#ifndef LVS_EX_FULLROWSELECT + #define LVS_EX_FULLROWSELECT 0x00000020 +#endif -#endif // _WIN32_WCE >= 400 +#ifndef TVS_FULLROWSELECT + #define TVS_FULLROWSELECT 0x1000 +#endif + +#ifndef TVM_SETBKCOLOR + #define TVM_SETBKCOLOR (TV_FIRST + 29) + #define TVM_SETTEXTCOLOR (TV_FIRST + 30) +#endif // Used in msgdlg.cpp, evtloop.cpp #ifndef MB_TASKMODAL -- 2.45.2