X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e0080ee4e5ffea768fda11426b6b3bf063c2c98..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/nativdlg/dialog1.rc?ds=sidebyside diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc index 54c00b55a9..3b008e6421 100644 --- a/samples/nativdlg/dialog1.rc +++ b/samples/nativdlg/dialog1.rc @@ -9,25 +9,19 @@ #define __WIN32__ #endif -#ifndef __WIN95__ -#define __WIN95__ -#endif +//#ifdef _MSC_VER +#define __VISUALC__ _MSC_VER +//#endif -#ifdef __GNUWIN32__ #define wxID_OK 5100 #define wxID_CANCEL 5101 #define wxID_APPLY 5102 #define wxID_YES 5103 #define wxID_NO 5104 -/* #include */ -#else -#include -/* #include */ -#endif #include "resource.h" -#if !defined(__GNUWIN32__) +#if !defined(__GNUWIN32__) && !defined(__BORLANDC__) #include #endif @@ -56,16 +50,16 @@ BEGIN GROUPBOX "wxStaticBox",IDC_STATIC,7,7,198,158 EDITTEXT IDC_EDIT1,64,23,125,14,ES_AUTOHSCROLL LTEXT "wxStaticText",IDC_STATIC,13,25,42,8 - CONTROL "wxCheckBox",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | + CONTROL "wxCheckBox",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,47,57,10 - COMBOBOX IDC_COMBO1,83,46,48,30,CBS_DROPDOWN | CBS_SORT | + COMBOBOX IDC_COMBO1,83,46,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "wxRadioButton",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON, 141,47,64,10 - LISTBOX IDC_LIST1,14,69,86,40,LBS_SORT | LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST1,14,69,86,40,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP SCROLLBAR IDC_SCROLLBAR1,111,71,76,11 - CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,10,116,100,15 CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,111,90, 10,14 @@ -73,4 +67,3 @@ END #endif // English (U.K.) resources ///////////////////////////////////////////////////////////////////////////// -