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

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

Browse Source 
compilation error; add wxFRAME_TOOL_WINDOW style


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-15 17:47:11 +00:00
parent caaa4cfd67
commit cd2df130f8
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/motif/install.txt
View File

@@ -81,6 +81,10 @@ Notes:
I'd prefer you to fix the problem and send the fix to me :-) or at I'd prefer you to fix the problem and send the fix to me :-) or at
least let me know about it. 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 - If you run into problems with a missing X11/Xpm.h header, you
need to install the XPM package. It can be obtained from: need to install the XPM package. It can be obtained from:

9
include/wx/defs.h
View File

@@ -553,13 +553,20 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
#define wxSP_WRAP 0x0020 #define wxSP_WRAP 0x0020
/* /*
* wxSplitterWnd flags * wxSplitterWindow flags
*/ */
#define wxSP_NOBORDER 0x0000 #define wxSP_NOBORDER 0x0000
#define wxSP_3D 0x0004 #define wxSP_3D 0x0004
#define wxSP_BORDER 0x0008 #define wxSP_BORDER 0x0008
/*
* wxFrame extra flags
*/
// No title on taskbar
#define wxFRAME_TOOL_WINDOW 0x0004
/* /*
* wxTabCtrl flags * wxTabCtrl flags
*/ */

4
src/generic/gridg.cpp
View File

@@ -88,7 +88,7 @@ wxGenericGrid::wxGenericGrid(void)
m_editable = TRUE; m_editable = TRUE;
#if defined(__WIN95__) #if defined(__WIN95__)
m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X); m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
#elseif defined(__WXGTK__) #elif defined(__WXGTK__)
m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X); m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
#else #else
m_scrollWidth = 16; m_scrollWidth = 16;
@@ -146,7 +146,7 @@ bool wxGenericGrid::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
m_editable = TRUE; m_editable = TRUE;
#if defined(__WIN95__) #if defined(__WIN95__)
m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X); m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
#elseif defined(__WXGTK__) #elif defined(__WXGTK__)
m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X); m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
#else #else
m_scrollWidth = 16; m_scrollWidth = 16;

3
src/msw/frame.cpp
View File

@@ -606,6 +606,9 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
WXDWORD extendedStyle = MakeExtendedStyle(style); WXDWORD extendedStyle = MakeExtendedStyle(style);
if (style & wxFRAME_TOOL_WINDOW)
extendedStyle |= WS_EX_TOOLWINDOW;
if (style & wxSTAY_ON_TOP) if (style & wxSTAY_ON_TOP)
extendedStyle |= WS_EX_TOPMOST; extendedStyle |= WS_EX_TOPMOST;

2
src/msw/listctrl.cpp
View File

@@ -100,7 +100,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
if ( want3D || wxStyleHasBorder(m_windowStyle) ) if ( want3D || wxStyleHasBorder(m_windowStyle) )
wstyle |= WS_BORDER; wstyle |= WS_BORDER;
wstyle |= LVS_SHAREIMAGELISTS; wstyle |= LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS ;
m_baseStyle = wstyle; m_baseStyle = wstyle;
long oldStyle = 0; // Dummy long oldStyle = 0; // Dummy

2
src/msw/radiobut.cpp
View File

@@ -77,7 +77,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
groupStyle = WS_GROUP; groupStyle = WS_GROUP;
// long msStyle = groupStyle | RADIO_FLAGS; // 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; bool want3D;
WXDWORD exStyle = Determine3DEffects(0, &want3D) ; WXDWORD exStyle = Determine3DEffects(0, &want3D) ;