INTEGRATION: CWS dba24b (1.5.308); FILE MERGED

2007/08/22 11:41:59 oj 1.5.308.1: #i76374# handle cross join as natural join now in query design

dbaccess/source/ui/querydesign/querydlg.hrc

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: querydlg.hrc,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:33:56 $
+ *  last change: $Author: hr $ $Date: 2007-11-01 15:35:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,12 +47,21 @@
 
 #define GB_FIELDS       1
 
+#define CB_NATURAL      1
+
 #define PB_OK           1
 #define PB_CANCEL       2
 #define PB_HELP         3
 #define ML_HELPTEXT     4
 
-#define WND_CONTROL     1
+#define WND_JOIN_CONTROL    1
+#define WND_CONTROL         2
+
+#define ID_INNER_JOIN       1
+#define ID_LEFT_JOIN        2
+#define ID_RIGHT_JOIN       3
+#define ID_FULL_JOIN        4
+#define ID_CROSS_JOIN       5
 
 #endif // DBAUI_QUERYDLG_HRC