From cd2df130f8162dc2cf9794c1507cd4bddce53910 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 15 Dec 1998 17:47:11 +0000 Subject: [PATCH] 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 --- docs/motif/install.txt | 4 ++++ include/wx/defs.h | 9 ++++++++- src/generic/gridg.cpp | 4 ++-- src/msw/frame.cpp | 3 +++ src/msw/listctrl.cpp | 2 +- src/msw/radiobut.cpp | 2 +- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/motif/install.txt b/docs/motif/install.txt index 7860a169a7..2f99c8a5a8 100644 --- 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 41987323ee..74aba1c334 100644 --- 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 84b4b4546f..5d2fd50e1f 100644 --- 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 c46347705c..70feafee93 100644 --- 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 950b6d809b..99168339d9 100644 --- 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 de90c0ad7b..ee28cf78d7 100644 --- 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) ; -- 2.45.2