Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Altered default wxTextCtrl height; removed wx_msw from cube.cpp;

Browse Source 
widened a couple of controls in resource sample; changed a BC++ test
in longlong.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-06-28 07:37:27 +00:00
parent 09d7c0f79e
commit 0c3e16933d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/longlong.h
View File

@@ -52,7 +52,7 @@
#define wxLongLongIsLong #define wxLongLongIsLong
#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
#define wxLongLong_t __int64 #define wxLongLong_t __int64
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x530) #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
#define wxLongLong_t __int64 #define wxLongLong_t __int64
#elif defined(__GNUG__) #elif defined(__GNUG__)
#define wxLongLong_t long long #define wxLongLong_t long long

3
include/wx/msw/private.h
View File

@@ -155,7 +155,8 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
#define DEFAULT_ITEM_HEIGHT 80 #define DEFAULT_ITEM_HEIGHT 80
// Scale font to get edit control height // Scale font to get edit control height
#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2) //#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2)
#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (cy+8)
// Generic subclass proc, for panel item moving/sizing and intercept // Generic subclass proc, for panel item moving/sizing and intercept
// EDIT control VK_RETURN messages // EDIT control VK_RETURN messages

2
samples/opengl/cube/cube.cpp
View File

@@ -427,7 +427,7 @@ void MyFrame::OnNewWindow()
MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone", MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone",
wxPoint(50, 50), wxSize(400, 300)); wxPoint(50, 50), wxSize(400, 300));
// Give it an icon // Give it an icon
#ifdef wx_msw #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif

4
samples/resource/dialog1.wxr
View File

@@ -9,13 +9,13 @@ static char *dialog1 = "dialog(name = 'dialog1',\
font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\ font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 184, 103,\ control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 184, 103,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [102, wxRadioBox, 'Radiobox', 'wxRA_SPECIFY_COLS', 'radiobox2', 13, 24, 40, 72, ['One', 'Two', 'Three', 'Four', 'One more'], 1,\ control = [102, wxRadioBox, 'Radiobox', 'wxRA_SPECIFY_COLS', 'radiobox2', 13, 24, 45, 72, ['One', 'Two', 'Three', 'Four', 'One more'], 1,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 62, 24, 67, 33, 'wxWindows rules!',\ control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 62, 24, 67, 33, 'wxWindows rules!',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [105, wxListBox, '', '0', 'listbox4', 62, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\ control = [105, wxListBox, '', '0', 'listbox4', 62, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 141, 26, 36, 14, 0,\ control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 141, 26, 40, 14, 0,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [107, wxStaticText, 'My Message', '0', 'message10', 143, 57, 39, 12, '',\ control = [107, wxStaticText, 'My Message', '0', 'message10', 143, 57, 39, 12, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\