]> git.saurik.com Git - wxWidgets.git/commitdiff
added wx/msw/missing.h
authorVáclav Slavík <vslavik@fastmail.fm>
Tue, 23 Apr 2002 16:18:26 +0000 (16:18 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Tue, 23 Apr 2002 16:18:26 +0000 (16:18 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

16 files changed:
distrib/msw/tmake/filelist.txt
include/wx/msw/missing.h [new file with mode: 0644]
src/gtk/files.lst
src/gtk1/files.lst
src/mac/carbon/files.lst
src/mac/files.lst
src/mgl/files.lst
src/microwin/files.lst
src/motif/files.lst
src/msw/files.lst
src/msw/helpchm.cpp
src/msw/listctrl.cpp
src/wxBase.dsp
src/wxUniv.dsp
src/wxWindows.dsp
src/x11/files.lst

index 9f75a5646e7021a87991a1663564cc3578ef1445..c1932fe457cc0898656f7e9348950d79c35b4734 100644 (file)
@@ -1281,6 +1281,7 @@ menuitem.h        MSWH
 metafile.h     MSWH
 mimetype.h     MSWH    Win32Only,Base
 minifram.h     MSWH
+missing.h      MSWH
 msgdlg.h       MSWH
 mslu.h MSWH
 msvcrt.h       MSWH
diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
new file mode 100644 (file)
index 0000000..305910f
--- /dev/null
@@ -0,0 +1,184 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        missing.h
+// Purpose:     Declarations for parts of the Win32 SDK that are missing in
+//              the version that comes with some compilers
+// Created:     2002/04/23
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MISSING_H_
+#define _WX_MISSING_H_
+
+// ----------------------------------------------------------------------------
+// ListView common control
+// ----------------------------------------------------------------------------
+
+#ifndef LVHT_ONITEM
+    #define LVHT_ONITEM \
+                (LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)
+#endif
+
+#ifndef LVM_SETEXTENDEDLISTVIEWSTYLE
+    #define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
+#endif
+
+#ifndef LVS_EX_FULLROWSELECT
+    #define LVS_EX_FULLROWSELECT 0x00000020
+#endif
+
+#ifndef LVS_OWNERDATA
+    #define LVS_OWNERDATA 0x1000
+#endif
+
+#ifndef LVM_FIRST
+    #define LVM_FIRST 0x1000
+#endif
+
+#ifndef HDM_FIRST
+    #define HDM_FIRST 0x1200
+#endif
+
+// mingw32/cygwin don't have declarations for comctl32.dll 4.70+ stuff
+#ifndef NM_CACHEHINT
+    typedef struct tagNMLVCACHEHINT
+    {
+        NMHDR   hdr;
+        int     iFrom;
+        int     iTo;
+    } NMLVCACHEHINT;
+
+    #define NM_CACHEHINT NMLVCACHEHINT
+#endif
+
+#ifndef LVN_ODCACHEHINT
+    #define LVN_ODCACHEHINT (-113)
+#endif
+
+#ifndef ListView_GetHeader
+    #define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
+#endif
+
+#ifndef LVM_GETHEADER
+    #define LVM_GETHEADER (LVM_FIRST+31)
+#endif
+
+#ifndef Header_GetItemRect
+    #define Header_GetItemRect(w,i,r) \
+            (BOOL)SendMessage((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r))
+#endif
+
+#ifndef HDM_GETITEMRECT
+    #define HDM_GETITEMRECT (HDM_FIRST+7)
+#endif
+
+#ifndef LVCF_IMAGE
+    #define LVCF_IMAGE             0x0010
+#endif
+
+#ifndef LVCFMT_BITMAP_ON_RIGHT
+    #define LVCFMT_BITMAP_ON_RIGHT 0x1000
+#endif
+
+#if defined(__GNUWIN32__) && !defined(LV_ITEM) \
+    && !wxCHECK_W32API_VERSION( 0, 5 )
+typedef struct _LVITEMW {
+    UINT mask;
+    int iItem;
+    int iSubItem;
+    UINT state;
+    UINT stateMask;
+    LPWSTR pszText;
+    int cchTextMax;
+    int iImage;
+    LPARAM lParam;
+#if (_WIN32_IE >= 0x0300)
+    int iIndent;
+#endif
+} LV_ITEMW;
+typedef LV_ITEM LV_ITEMA;
+#endif
+
+#if defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 0, 5 )
+#ifndef LV_DISPINFOA
+typedef struct tagNMLVDISPINFOA {
+        NMHDR hdr;
+        LV_ITEMA item;
+} NMLVDISPINFOA, FAR *LPNMLVDISPINFOA;
+#define _LV_DISPINFOA tagNMLVDISPINFOA
+#define LV_DISPINFOA NMLVDISPINFOA
+#endif
+#ifndef LV_DISPINFOW
+typedef struct tagNMLVDISPINFOW {
+        NMHDR hdr;
+        LV_ITEMW item;
+} NMLVDISPINFOW, FAR *LPNMLVDISPINFOW;
+#define _LV_DISPINFOW tagNMLVDISPINFOW
+#define LV_DISPINFOW NMLVDISPINFOW
+#endif
+#endif
+
+
+// ----------------------------------------------------------------------------
+// MS HTML Help
+// ----------------------------------------------------------------------------
+
+// instead of including htmlhelp.h, duplicate the things from it we need here:
+
+enum
+{
+    HH_DISPLAY_TOPIC,
+    HH_DISPLAY_TOC,
+    HH_DISPLAY_INDEX,
+    HH_DISPLAY_SEARCH,
+    HH_SET_WIN_TYPE,
+    HH_GET_WIN_TYPE,
+    HH_GET_WIN_HANDLE,
+    HH_ENUM_INFO_TYPE,
+    HH_SET_INFO_TYPE,
+    HH_SYNC,
+    HH_RESERVED1,
+    HH_RESERVED2,
+    HH_RESERVED3,
+    HH_KEYWORD_LOOKUP,
+    HH_DISPLAY_TEXT_POPUP,
+    HH_HELP_CONTEXT,
+    HH_TP_HELP_CONTEXTMENU,
+    HH_TP_HELP_WM_HELP,
+    HH_CLOSE_ALL,
+    HH_ALINK_LOOKUP,
+    HH_GET_LAST_ERROR,
+    HH_ENUM_CATEGORY,
+    HH_ENUM_CATEGORY_IT,
+    HH_RESET_IT_FILTER,
+    HH_SET_INCLUSIVE_FILTER,
+    HH_SET_EXCLUSIVE_FILTER
+};
+
+struct HH_POPUP
+{
+    int       cbStruct;
+    HINSTANCE hinst;
+    UINT      idString;
+    LPCTSTR   pszText;
+    POINT     pt;
+    COLORREF  clrForeground;
+    COLORREF  clrBackground;
+    RECT      rcMargins;
+    LPCTSTR   pszFont;
+};
+
+struct HH_AKLINK
+{
+    int       cbStruct;
+    BOOL      fReserved;
+    LPCTSTR   pszKeywords;
+    LPCTSTR   pszUrl;
+    LPCTSTR   pszMsgText;
+    LPCTSTR   pszMsgTitle;
+    LPCTSTR   pszWindow;
+    BOOL      fIndexOnFail;
+};
+
+#endif
+    // _WX_MISSING_H_
index 955714a70f074b85d90daa9e9888add34edce149..c974c316027f8bd272451eb4ec7cb46b530ffc42 100644 (file)
@@ -384,6 +384,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
index 955714a70f074b85d90daa9e9888add34edce149..c974c316027f8bd272451eb4ec7cb46b530ffc42 100644 (file)
@@ -384,6 +384,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
index 33ddee3faf4c6da44e8d4c45d1e8539edbd66dec..78bd42f50925eb92a6bca1280ae40d8b4eaafaf9 100644 (file)
@@ -390,6 +390,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
index 33ddee3faf4c6da44e8d4c45d1e8539edbd66dec..78bd42f50925eb92a6bca1280ae40d8b4eaafaf9 100644 (file)
@@ -390,6 +390,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
index 9574b76fc3ba861c42963dee5428d8246c0d99b6..14552622028f5c84ca8145438e76cb4f57fda2c0 100644 (file)
@@ -345,6 +345,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
index 878c5709419b71d303506659ae49cc60ed80ed13..a44d985f8a22fe52831668b88f461d1d5f6a9ad5 100644 (file)
@@ -345,6 +345,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
@@ -521,6 +522,7 @@ ALL_HEADERS = \
                msw/metafile.h \
                msw/mimetype.h \
                msw/minifram.h \
+               msw/missing.h \
                msw/msgdlg.h \
                msw/mslu.h \
                msw/msvcrt.h \
index 53e7dce06083eb9f784854a5ce527596f8ecc054..099680f545b800a4700cd96ddbd80e4cee4adad6 100644 (file)
@@ -375,6 +375,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
index 8742a5817f2d704eb33d97b23c9f385d7849fc4c..69ddf7699a149b295c160131ee316c4ffe9ae04c 100644 (file)
@@ -406,6 +406,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \
@@ -582,6 +583,7 @@ ALL_HEADERS = \
                msw/metafile.h \
                msw/mimetype.h \
                msw/minifram.h \
+               msw/missing.h \
                msw/msgdlg.h \
                msw/mslu.h \
                msw/msvcrt.h \
index ab91913ff24365adea9ffca20f9620246aa52724..20e0bbc27e6775ec650b646f993f9c7627f3c100 100644 (file)
 #endif
 
 #include "wx/msw/private.h"
-
-// instead of including htmlhelp.h, duplicate the things from it we need here
-
-enum
-{
-    HH_DISPLAY_TOPIC,
-    HH_DISPLAY_TOC,
-    HH_DISPLAY_INDEX,
-    HH_DISPLAY_SEARCH,
-    HH_SET_WIN_TYPE,
-    HH_GET_WIN_TYPE,
-    HH_GET_WIN_HANDLE,
-    HH_ENUM_INFO_TYPE,
-    HH_SET_INFO_TYPE,
-    HH_SYNC,
-    HH_RESERVED1,
-    HH_RESERVED2,
-    HH_RESERVED3,
-    HH_KEYWORD_LOOKUP,
-    HH_DISPLAY_TEXT_POPUP,
-    HH_HELP_CONTEXT,
-    HH_TP_HELP_CONTEXTMENU,
-    HH_TP_HELP_WM_HELP,
-    HH_CLOSE_ALL,
-    HH_ALINK_LOOKUP,
-    HH_GET_LAST_ERROR,
-    HH_ENUM_CATEGORY,
-    HH_ENUM_CATEGORY_IT,
-    HH_RESET_IT_FILTER,
-    HH_SET_INCLUSIVE_FILTER,
-    HH_SET_EXCLUSIVE_FILTER
-};
-
-struct HH_POPUP
-{
-    int       cbStruct;
-    HINSTANCE hinst;
-    UINT      idString;
-    LPCTSTR   pszText;
-    POINT     pt;
-    COLORREF  clrForeground;
-    COLORREF  clrBackground;
-    RECT      rcMargins;
-    LPCTSTR   pszFont;
-};
-
-struct HH_AKLINK
-{
-    int       cbStruct;
-    BOOL      fReserved;
-    LPCTSTR   pszKeywords;
-    LPCTSTR   pszUrl;
-    LPCTSTR   pszMsgText;
-    LPCTSTR   pszMsgTitle;
-    LPCTSTR   pszWindow;
-    BOOL      fIndexOnFail;
-};
+#include "wx/msw/missing.h"
 
 // ----------------------------------------------------------------------------
 // utility functions to manage the loading/unloading
index e95f417a955a284ee9ccc28f65ec551adb428a12..5c0482fb6aaafca106a5454e39c7313e51bb45d9 100644 (file)
     #include <commctrl.h>
 #endif
 
-#ifndef LVHT_ONITEM
-    #define LVHT_ONITEM \
-                (LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)
-#endif
-
-#ifndef LVM_SETEXTENDEDLISTVIEWSTYLE
-    #define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
-#endif
-
-#ifndef LVS_EX_FULLROWSELECT
-    #define LVS_EX_FULLROWSELECT 0x00000020
-#endif
-
-#ifndef LVS_OWNERDATA
-    #define LVS_OWNERDATA 0x1000
-#endif
-
-#ifndef LVM_FIRST
-    #define LVM_FIRST 0x1000
-#endif
-
-#ifndef HDM_FIRST
-    #define HDM_FIRST 0x1200
-#endif
-
-// mingw32/cygwin don't have declarations for comctl32.dll 4.70+ stuff
-#ifndef NM_CACHEHINT
-    typedef struct tagNMLVCACHEHINT
-    {
-        NMHDR   hdr;
-        int     iFrom;
-        int     iTo;
-    } NMLVCACHEHINT;
-
-    #define NM_CACHEHINT NMLVCACHEHINT
-#endif
-
-#ifndef LVN_ODCACHEHINT
-    #define LVN_ODCACHEHINT (-113)
-#endif
-
-#ifndef ListView_GetHeader
-    #define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
-#endif
-
-#ifndef LVM_GETHEADER
-    #define LVM_GETHEADER (LVM_FIRST+31)
-#endif
-
-#ifndef Header_GetItemRect
-    #define Header_GetItemRect(w,i,r) \
-            (BOOL)SendMessage((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r))
-#endif
-
-#ifndef HDM_GETITEMRECT
-    #define HDM_GETITEMRECT (HDM_FIRST+7)
-#endif
-
-#ifndef LVCF_IMAGE
-    #define LVCF_IMAGE             0x0010
-#endif
-
-#ifndef LVCFMT_BITMAP_ON_RIGHT
-    #define LVCFMT_BITMAP_ON_RIGHT 0x1000
-#endif
-
-#if defined(__GNUWIN32__) && !defined(LV_ITEM) \
-    && !wxCHECK_W32API_VERSION( 0, 5 )
-typedef struct _LVITEMW {
-    UINT mask;
-    int iItem;
-    int iSubItem;
-    UINT state;
-    UINT stateMask;
-    LPWSTR pszText;
-    int cchTextMax;
-    int iImage;
-    LPARAM lParam;
-#if (_WIN32_IE >= 0x0300)
-    int iIndent;
-#endif
-} LV_ITEMW;
-typedef LV_ITEM LV_ITEMA;
-#endif
-
-#if defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 0, 5 )
-#ifndef LV_DISPINFOA
-typedef struct tagNMLVDISPINFOA {
-        NMHDR hdr;
-        LV_ITEMA item;
-} NMLVDISPINFOA, FAR *LPNMLVDISPINFOA;
-#define _LV_DISPINFOA tagNMLVDISPINFOA
-#define LV_DISPINFOA NMLVDISPINFOA
-#endif
-#ifndef LV_DISPINFOW
-typedef struct tagNMLVDISPINFOW {
-        NMHDR hdr;
-        LV_ITEMW item;
-} NMLVDISPINFOW, FAR *LPNMLVDISPINFOW;
-#define _LV_DISPINFOW tagNMLVDISPINFOW
-#define LV_DISPINFOW NMLVDISPINFOW
-#endif
-#endif
+#include "wx/msw/missing.h"
 
 // ----------------------------------------------------------------------------
 // private functions
index 6b1e52b6b9e3478d0c42ad2b70d02729a3d78d77..4922351c9d10d97fa0988c7aef27b069fb1707ee 100644 (file)
@@ -813,6 +813,10 @@ SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\ipc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
index 196200057b3e5814e573fe5482a8f60b63a53f54..f5e5ea109e160daa56991100da928ae48820e3d7 100644 (file)
@@ -1694,6 +1694,10 @@ SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\ipc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
index a4b8d193adaafdc6113f49c449f308a91f65eb06..2b6b8f084fae65eaf26699265acf243ed09d1057 100644 (file)
@@ -1974,6 +1974,10 @@ SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\ipc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
@@ -2679,6 +2683,10 @@ SOURCE=..\include\wx\msw\minifram.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\missing.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\msgdlg.h
 # End Source File
 # Begin Source File
index 52fdd6903096005e3afe1e5b63b4dab6cc915656..39055001e673f337cca3df33d075c15fb12d4b01 100644 (file)
@@ -354,6 +354,7 @@ ALL_HEADERS = \
                imagxpm.h \
                intl.h \
                ioswrap.h \
+               ipc.h \
                ipcbase.h \
                isql.h \
                isqlext.h \