Cured radiobutton non-setting by using BS_AUTORADIOBUTTON; cured gridg.cpp

compilation error; add wxFRAME_TOOL_WINDOW style

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 7860a169a7a0ffc6eeedcbf7c3b0be26ffe9e212..2f99c8a5a82825f68baa5e53663b123f84f90aac 100644 (file)
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -81,6 +81,10 @@ Notes:
   I'd prefer you to fix the problem and send the fix to me :-) or at
   least let me know about it.
 
+- If you have trouble compiling the file y_tab.c, or have strange
+  linking errors, check whether you're using a C or C++ compiler for this file.
+  You should specify a C compiler in the CCLEX variable in src/make.env.
+
 - If you run into problems with a missing X11/Xpm.h header, you
   need to install the XPM package. It can be obtained from:
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 41987323ee543c97e15d838a92fc07419e4199f1..74aba1c33488447ee685229931bb8f391ff6b1a0 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -553,13 +553,20 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxSP_WRAP           0x0020
 
 /*
- * wxSplitterWnd flags
+ * wxSplitterWindow flags
  */
 
 #define wxSP_NOBORDER       0x0000
 #define wxSP_3D             0x0004
 #define wxSP_BORDER         0x0008
 
+/*
+ * wxFrame extra flags
+ */
+
+// No title on taskbar
+#define wxFRAME_TOOL_WINDOW 0x0004
+
 /*
  * wxTabCtrl flags
  */

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 84b4b4546f361ca115c3778449564b78787f9344..5d2fd50e1fb8eae8e5fc554ba2671f495cf90c1a 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -88,7 +88,7 @@ wxGenericGrid::wxGenericGrid(void)
   m_editable = TRUE;
 #if defined(__WIN95__)
   m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
-#elseif defined(__WXGTK__)
+#elif defined(__WXGTK__)
   m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
 #else
   m_scrollWidth = 16;
@@ -146,7 +146,7 @@ bool wxGenericGrid::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
   m_editable = TRUE;
 #if defined(__WIN95__)
   m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
-#elseif defined(__WXGTK__)
+#elif defined(__WXGTK__)
   m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
 #else
   m_scrollWidth = 16;

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index c46347705cf830a2fa04fac3fa16b4958aecc717..70feafee9398637fcca994fb916987d45b715d1e 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -606,6 +606,9 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
+  if (style & wxFRAME_TOOL_WINDOW)
+    extendedStyle |= WS_EX_TOOLWINDOW;
+
   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;
 

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 950b6d809bdaf6cabed1b32852dbbba77b563e75..99168339d91e23adb09aeecc6a1e085929dd411d 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -100,7 +100,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     wstyle |= WS_BORDER;
 
-  wstyle |= LVS_SHAREIMAGELISTS;
+  wstyle |= LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS   ;
   m_baseStyle = wstyle;
 
   long oldStyle = 0; // Dummy

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index de90c0ad7b62a96988d53ccc6b283bd3c4419d39..ee28cf78d7e1504f02898964de4cb63052084e69 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -77,7 +77,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     groupStyle = WS_GROUP;
 
 //  long msStyle = groupStyle | RADIO_FLAGS;
-  long msStyle = groupStyle | BS_RADIOBUTTON | WS_CHILD | WS_VISIBLE ;
+  long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ;
 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;