Changeset 148 for trunk/MFCtooling

Timestamp:

08/08/11 14:37:37 (13 years ago)

Author:

jhall

Message:

added some new elements

Location:

trunk/MFCtooling/TestProg

Files:

• TestProg.aps (modified) (previous)
• TestProg.cpp (modified) (4 diffs)
• TestProg.rc (modified) (3 diffs)
• TestProg.vcproj (modified) (6 diffs)
• resource.h (modified) (2 diffs)

trunk/MFCtooling/TestProg/TestProg.cpp

@@ -11 +11 @@
 #include "TestProgView.h"
 #include "afxwin.h"
+#include "afxcmn.h"
 
 #ifdef _DEBUG
@@ -206 +207 @@
         DECLARE_MESSAGE_MAP()
 public:
+        CListBox listbox_test;
+        CTabCtrl tabControl_test;
+        afx_msg void OnBnClickedButton1();
 };
 
@@ -216 +220 @@
 {
         CDialog::DoDataExchange(pDX);
-}
-
-
+
+        DDX_Control(pDX, IDC_LIST1, listbox_test);
+        for(int i=0; i<10; i++) listbox_test.AddString(L"Testeintrag");
+
+        DDX_Control(pDX, IDC_TAB1, tabControl_test);
+        tabControl_test.InsertItem(0, L"Tab 1");
+        tabControl_test.InsertItem(1, L"Tab 2");
+        tabControl_test.InsertItem(2, L"Tab 3");
+}
 
 BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
@@ -233 +243 @@
 
 // CTestProgApp message handlers
-

trunk/MFCtooling/TestProg/TestProg.rc

@@ -370 +370 @@
 //
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 171, 202
+IDD_ABOUTBOX DIALOGEX 0, 0, 271, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About TestProg"
@@ -378 +378 @@
     LTEXT           "TestProg, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX
     LTEXT           "Copyright (C) 2010",IDC_STATIC,42,26,114,8
-    DEFPUSHBUTTON   "OK",IDOK,114,181,50,14,WS_GROUP
-    EDITTEXT        IDC_EDIT1,37,57,86,16,ES_AUTOHSCROLL
-    CONTROL         "Check1",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,79,39,10
-    COMBOBOX        IDC_COMBO1,42,92,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,200,188,50,14,WS_GROUP
+    EDITTEXT        IDC_EDIT1,17,57,86,16,ES_AUTOHSCROLL
+    CONTROL         "Check1",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,79,39,10
+    COMBOBOX        IDC_COMBO1,18,92,48,16,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Radio1",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,19,124,38,10
     CONTROL         "Radio2",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,19,139,38,10
-    CONTROL         "Radio3",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,18,156,38,10
-    GROUPBOX        "Static",IDC_STATIC,7,114,68,63
-    CONTROL         "",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,71,122,100,15
+    CONTROL         "Radio3",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,19,155,38,10
+    GROUPBOX        "Static",IDC_STATIC,15,114,68,63
+    CONTROL         "",IDC_SLIDER1,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,91,85,21,93
+    LISTBOX         IDC_LIST1,132,20,116,49,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_TAB1,"SysTabControl32",0x0,135,115,119,55
+    CONTROL         "",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,17,182,98,16
 END
 
@@ -440 +443 @@
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 164
+        RIGHTMARGIN, 264
         TOPMARGIN, 7
-        BOTTOMMARGIN, 195
+        BOTTOMMARGIN, 211
     END
 END

trunk/MFCtooling/TestProg/TestProg.vcproj

@@ -2 +2 @@
 <VisualStudioProject
         ProjectType="Visual C++"
-        Version="9.00"
+        Version="9,00"
         Name="TestProg"
         ProjectGUID="{98889796-F392-4C4F-A619-BD2C1509B392}"
@@ -46 +46 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
+                                AdditionalIncludeDirectories=""
                                 PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
                                 MinimalRebuild="true"
@@ -70 +71 @@
                                 RegisterOutput="true"
                                 LinkIncremental="2"
+                                AdditionalLibraryDirectories=""
                                 GenerateDebugInformation="true"
                                 SubSystem="2"
@@ -94 +96 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
+                                CommandLine="copy C:\Projects\MFCtooling\Debug\userlog.dll C:\Programme\Mahr\MarWin\userlog.dll /y"
                         />
                 </Configuration>
@@ -127 +130 @@
                                 Optimization="2"
                                 EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="C:\Projects"
                                 PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
                                 MinimalRebuild="false"
@@ -150 +154 @@
                                 Name="VCLinkerTool"
                                 RegisterOutput="true"
+                                AdditionalDependencies="C:\Projects\msl\lib\win32\release\trace.lib"
                                 LinkIncremental="1"
+                                AdditionalLibraryDirectories="C:\Projects"
                                 GenerateDebugInformation="true"
                                 SubSystem="2"

trunk/MFCtooling/TestProg/resource.h

@@ -19 +19 @@
 #define IDC_SLIDER1                     1006
 #define IDC_SPIN1                       1007
+#define IDC_SLIDER2                     1007
+#define IDC_LIST1                       1008
+#define IDC_TAB1                        1010
+#define IDC_TREE1                       1013
 #define ID_CANCEL_EDIT_CNTR             32768
 #define ID_CANCEL_EDIT_SRVR             32769
@@ -28 +32 @@
 #define _APS_NEXT_RESOURCE_VALUE        131
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1008
+#define _APS_NEXT_CONTROL_VALUE         1014
 #define _APS_NEXT_SYMED_VALUE           101
 #endif