oledlg: Move the flag defines to under their respective structure definitions and remove some duplicates.
diff --git a/include/oledlg.h b/include/oledlg.h
index 2d95f45..2313b69 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -41,56 +41,6 @@
#define IDC_OLEUIHELP 99
-/* Change Source Dialog flags */
-#define CSF_SHOWHELP 0x00000001L
-#define CSF_VALIDSOURCE 0x00000002L
-#define CSF_ONLYGETSOURCE 0x00000004L
-#define CSF_EXPLORER 0x00000008L
-
-#define PSF_SHOWHELP 0x00000001L
-#define PSF_SELECTPASTE 0x00000002L
-#define PSF_SELECTPASTELINK 0x00000004L
-#define PSF_CHECKDISPLAYASICON 0x00000008L
-#define PSF_DISABLEDISPLAYASICON 0x00000010L
-#define PSF_HIDECHANGEICON 0x00000020L
-#define PSF_STAYONCLIPBOARDCHANGE 0x00000040L
-#define PSF_NOREFRESHDATAOBJECT 0x00000080L
-
-#define IOF_SHOWHELP 0x00000001L
-#define IOF_SELECTCREATENEW 0x00000002L
-#define IOF_SELECTCREATEFROMFILE 0x00000004L
-#define IOF_CHECKLINK 0x00000008L
-#define IOF_CHECKDISPLAYASICON 0x00000010L
-#define IOF_CREATENEWOBJECT 0x00000020L
-#define IOF_CREATEFILEOBJECT 0x00000040L
-#define IOF_CREATELINKOBJECT 0x00000080L
-#define IOF_DISABLELINK 0x00000100L
-#define IOF_VERIFYSERVERSEXIST 0x00000200L
-#define IOF_DISABLEDISPLAYASICON 0x00000400L
-#define IOF_HIDECHANGEICON 0x00000800L
-#define IOF_SHOWINSERTCONTROL 0x00001000L
-#define IOF_SELECTCREATECONTROL 0x00002000L
-
-#define CF_SHOWHELPBUTTON 0x00000001L
-#define CF_SETCONVERTDEFAULT 0x00000002L
-#define CF_SETACTIVATEDEFAULT 0x00000004L
-#define CF_SELECTCONVERTTO 0x00000008L
-#define CF_SELECTACTIVATEAS 0x00000010L
-#define CF_DISABLEDISPLAYASICON 0x00000020L
-#define CF_DISABLEACTIVATEAS 0x00000040L
-#define CF_HIDECHANGEICON 0x00000080L
-#define CF_CONVERTONLY 0x00000100L
-
-#define CIF_SHOWHELP 0x00000001L
-#define CIF_SELECTCURRENT 0x00000002L
-#define CIF_SELECTDEFAULT 0x00000004L
-#define CIF_SELECTFROMFILE 0x00000008L
-#define CIF_USEICONEXE 0x00000010L
-
-#define BZ_DISABLECANCELBUTTON 0x00000001L
-#define BZ_DISABLESWITCHTOBUTTON 0x00000002L
-#define BZ_DISABLERETRYBUTTON 0x00000004L
-#define BZ_NOTRESPONDINGDIALOG 0x00000008L
#define OLEUI_ERR_STANDARDMAX 116
@@ -123,11 +73,6 @@
#define OLEUI_ERR_LOADSTRING 115
#define OLEUI_ERR_STANDARDMAX 116
-#define OPF_OBJECTISLINK 0x00000001L
-#define OPF_NOFILLDEFAULT 0x00000002L
-#define OPF_SHOWHELP 0x00000004L
-#define OPF_DISABLECONVERT 0x00000008L
-
typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM);
/*****************************************************************************
@@ -189,6 +134,20 @@
DECL_WINELIB_TYPE_AW(POLEUIINSERTOBJECT)
DECL_WINELIB_TYPE_AW(LPOLEUIINSERTOBJECT)
+#define IOF_SHOWHELP 0x00000001L
+#define IOF_SELECTCREATENEW 0x00000002L
+#define IOF_SELECTCREATEFROMFILE 0x00000004L
+#define IOF_CHECKLINK 0x00000008L
+#define IOF_CHECKDISPLAYASICON 0x00000010L
+#define IOF_CREATENEWOBJECT 0x00000020L
+#define IOF_CREATEFILEOBJECT 0x00000040L
+#define IOF_CREATELINKOBJECT 0x00000080L
+#define IOF_DISABLELINK 0x00000100L
+#define IOF_VERIFYSERVERSEXIST 0x00000200L
+#define IOF_DISABLEDISPLAYASICON 0x00000400L
+#define IOF_HIDECHANGEICON 0x00000800L
+#define IOF_SHOWINSERTCONTROL 0x00001000L
+#define IOF_SELECTCREATECONTROL 0x00002000L
/*****************************************************************************
* CONVERT DIALOG
@@ -249,6 +208,16 @@
DECL_WINELIB_TYPE_AW(POLEUICONVERT)
DECL_WINELIB_TYPE_AW(LPOLEUICONVERT)
+#define CF_SHOWHELPBUTTON 0x00000001L
+#define CF_SETCONVERTDEFAULT 0x00000002L
+#define CF_SETACTIVATEDEFAULT 0x00000004L
+#define CF_SELECTCONVERTTO 0x00000008L
+#define CF_SELECTACTIVATEAS 0x00000010L
+#define CF_DISABLEDISPLAYASICON 0x00000020L
+#define CF_DISABLEACTIVATEAS 0x00000040L
+#define CF_HIDECHANGEICON 0x00000080L
+#define CF_CONVERTONLY 0x00000100L
+
/*****************************************************************************
* CHANGE ICON DIALOG
*/
@@ -291,6 +260,12 @@
DECL_WINELIB_TYPE_AW(LPOLEUICHANGEICON)
+#define CIF_SHOWHELP 0x00000001L
+#define CIF_SELECTCURRENT 0x00000002L
+#define CIF_SELECTDEFAULT 0x00000004L
+#define CIF_SELECTFROMFILE 0x00000008L
+#define CIF_USEICONEXE 0x00000010L
+
/*****************************************************************************
* PASTE SPECIAL DIALOG
*/
@@ -499,6 +474,15 @@
DECL_WINELIB_TYPE_AW(LPOLEUIBUSY)
+#define BZ_DISABLECANCELBUTTON 0x00000001L
+#define BZ_DISABLESWITCHTOBUTTON 0x00000002L
+#define BZ_DISABLERETRYBUTTON 0x00000004L
+#define BZ_NOTRESPONDINGDIALOG 0x00000008L
+
+/***********************************************************************************
+ * OBJECT PROPERTIES DIALOG
+ */
+
struct tagOLEUIOBJECTPROPSW;
struct tagOLEUIOBJECTPROPSA;
@@ -622,6 +606,12 @@
DECL_WINELIB_TYPE_AW(POLEUIOBJECTPROPS)
DECL_WINELIB_TYPE_AW(LPOLEUIOBJECTPROPS)
+#define OPF_OBJECTISLINK 0x00000001L
+#define OPF_NOFILLDEFAULT 0x00000002L
+#define OPF_SHOWHELP 0x00000004L
+#define OPF_DISABLECONVERT 0x00000008L
+
+
/************************************************************************************
* CHANGE SOURCE DIALOG
*/
@@ -675,6 +665,12 @@
DECL_WINELIB_TYPE_AW(POLEUICHANGESOURCE)
DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE)
+/* Change Source Dialog flags */
+#define CSF_SHOWHELP 0x00000001L
+#define CSF_VALIDSOURCE 0x00000002L
+#define CSF_ONLYGETSOURCE 0x00000004L
+#define CSF_EXPLORER 0x00000008L
+
/*****************************************************************************
* IOleUILinkContainer interface
