diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 3c378859be..be41db6d93 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -52,7 +52,7 @@
     #define wxLongLongIsLong
 #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
     #define wxLongLong_t __int64
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x530)
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
 #elif defined(__GNUG__)
     #define wxLongLong_t long long
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 16a579b957..8af2cfce9a 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -155,7 +155,8 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 #define DEFAULT_ITEM_HEIGHT 80
 
 // 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
 // EDIT control VK_RETURN messages
diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 38c9d0f48a..997b37131b 100644
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -427,7 +427,7 @@ void MyFrame::OnNewWindow()
   MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone",
                                wxPoint(50, 50), wxSize(400, 300));
   // Give it an icon
-#ifdef wx_msw
+#ifdef __WXMSW__
   frame->SetIcon(wxIcon("mondrian"));
 #endif
 
diff --git a/samples/resource/dialog1.wxr b/samples/resource/dialog1.wxr
index 6823b00437..dce403762d 100644
--- a/samples/resource/dialog1.wxr
+++ b/samples/resource/dialog1.wxr
@@ -9,13 +9,13 @@ static char *dialog1 = "dialog(name = 'dialog1',\
   font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
   control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 184, 103,\
       [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]],\
   control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 62, 24, 67, 33, 'wxWindows rules!',\
       [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
   control = [105, wxListBox, '', '0', 'listbox4', 62, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\
       [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]],\
   control = [107, wxStaticText, 'My Message', '0', 'message10', 143, 57, 39, 12, '',\
       [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\