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

1. wxListCtrl fixes

Browse Source 
a) implemented GetColumnCount()
 b) columns are always created with some reasonable (i.e. != 0) width

2. wxRadioBox: keyboard navigation now works inside it (almost) as it should


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-27 23:52:48 +00:00
parent 212d0bb3c7
commit e373f51b6c
4 changed files with 311 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/msw/listctrl.h
View File

@@ -171,7 +171,7 @@ public:
int m_format; // left, right, centre int m_format; // left, right, centre
int m_width; // width of column int m_width; // width of column
wxListItem(void); wxListItem();
}; };
// type of compare function for wxListCtrl sort operation // type of compare function for wxListCtrl sort operation
@@ -185,7 +185,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
* Public interface * Public interface
*/ */
wxListCtrl(void); wxListCtrl();
inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
@@ -193,7 +193,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
{ {
Create(parent, id, pos, size, style, validator, name); Create(parent, id, pos, size, style, validator, name);
} }
~wxListCtrl(void); ~wxListCtrl();
bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl"); long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl");
@@ -222,10 +222,10 @@ class WXDLLEXPORT wxListCtrl: public wxControl
// visible area of the list control (list or report view) // visible area of the list control (list or report view)
// or the total number of items in the list control (icon // or the total number of items in the list control (icon
// or small icon view) // or small icon view)
int GetCountPerPage(void) const; int GetCountPerPage() const;
// Gets the edit control for editing labels. // Gets the edit control for editing labels.
wxTextCtrl* GetEditControl(void) const; wxTextCtrl* GetEditControl() const;
// Gets information about the item // Gets information about the item
bool GetItem(wxListItem& info) const ; bool GetItem(wxListItem& info) const ;
@@ -267,10 +267,10 @@ class WXDLLEXPORT wxListCtrl: public wxControl
bool SetItemPosition(long item, const wxPoint& pos) ; bool SetItemPosition(long item, const wxPoint& pos) ;
// Gets the number of items in the list control // Gets the number of items in the list control
int GetItemCount(void) const; int GetItemCount() const;
// Gets the number of columns in the list control // Gets the number of columns in the list control
int GetColumnCount(void) const; int GetColumnCount() const { return m_colCount; }
// Retrieves the spacing between icons in pixels. // Retrieves the spacing between icons in pixels.
// If small is TRUE, gets the spacing for the small icon // If small is TRUE, gets the spacing for the small icon
@@ -278,17 +278,17 @@ class WXDLLEXPORT wxListCtrl: public wxControl
int GetItemSpacing(bool isSmall) const; int GetItemSpacing(bool isSmall) const;
// Gets the number of selected items in the list control // Gets the number of selected items in the list control
int GetSelectedItemCount(void) const; int GetSelectedItemCount() const;
// Gets the text colour of the listview // Gets the text colour of the listview
wxColour GetTextColour(void) const; wxColour GetTextColour() const;
// Sets the text colour of the listview // Sets the text colour of the listview
void SetTextColour(const wxColour& col); void SetTextColour(const wxColour& col);
// Gets the index of the topmost visible item when in // Gets the index of the topmost visible item when in
// list or report view // list or report view
long GetTopItem(void) const ; long GetTopItem() const ;
// Add or remove a single window style // Add or remove a single window style
void SetSingleStyle(long style, bool add = TRUE) ; void SetSingleStyle(long style, bool add = TRUE) ;
@@ -330,16 +330,16 @@ class WXDLLEXPORT wxListCtrl: public wxControl
bool DeleteItem(long item); bool DeleteItem(long item);
// Deletes all items // Deletes all items
bool DeleteAllItems(void) ; bool DeleteAllItems() ;
// Deletes a column // Deletes a column
bool DeleteColumn(int col); bool DeleteColumn(int col);
// Deletes all columns // Deletes all columns
bool DeleteAllColumns(void); bool DeleteAllColumns();
// Clears items, and columns if there are any. // Clears items, and columns if there are any.
void ClearAll(void); void ClearAll();
// Edit the label // Edit the label
wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)); wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
@@ -422,7 +422,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
// Recreate window - seems to be necessary when changing a style. // Recreate window - seems to be necessary when changing a style.
void RecreateWindow(void); void RecreateWindow();
// Add to pool: necessary because Windows needs to have a string // Add to pool: necessary because Windows needs to have a string
// still exist across 3 callbacks. // still exist across 3 callbacks.

57
include/wx/msw/radiobox.h
View File

@@ -21,7 +21,7 @@
WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr; WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
// List box item // List box item
class WXDLLEXPORT wxBitmap ; class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxRadioBox : public wxControl class WXDLLEXPORT wxRadioBox : public wxControl
{ {
@@ -35,18 +35,6 @@ public:
int x = -1, int y = -1, int width = -1, int height = -1, int x = -1, int y = -1, int width = -1, int height = -1,
int n = 0, char **choices = NULL, int n = 0, char **choices = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr); int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr);
/*
inline wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
int x, int y, int width, int height,
int n, wxBitmap **choices,
int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr)
{
Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, (const wxBitmap **)choices, majorDim, style,
wxDefaultValidator, name);
Callback(func);
}
*/
#endif // WXWIN_COMPATIBILITY #endif // WXWIN_COMPATIBILITY
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -58,17 +46,6 @@ public:
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name); Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
} }
/*
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxBitmap *choices[] = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
{
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
}
*/
~wxRadioBox(); ~wxRadioBox();
bool Create(wxWindow *parent, wxWindowID id, const wxString& title, bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -77,17 +54,9 @@ public:
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
/*
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxBitmap *choices[] = NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
*/
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
int FindString(const wxString& s) const; int FindString(const wxString& s) const;
void SetSelection(int N); void SetSelection(int N);
@@ -99,20 +68,20 @@ public:
wxString GetLabel() const; wxString GetLabel() const;
void SetLabel(const wxString& label); void SetLabel(const wxString& label);
void SetLabel(int item, const wxString& label) ; void SetLabel(int item, const wxString& label);
void SetLabel(int item, wxBitmap *bitmap) ; void SetLabel(int item, wxBitmap *bitmap);
wxString GetLabel(int item) const; wxString GetLabel(int item) const;
bool Show(bool show); bool Show(bool show);
void SetFocus(); void SetFocus();
void Enable(bool enable); void Enable(bool enable);
void Enable(int item, bool enable); void Enable(int item, bool enable);
void Show(int item, bool show) ; void Show(int item, bool show);
void SetLabelFont(const wxFont& WXUNUSED(font)) {}; void SetLabelFont(const wxFont& WXUNUSED(font)) {};
void SetButtonFont(const wxFont& font) { SetFont(font); } void SetButtonFont(const wxFont& font) { SetFont(font); }
virtual wxString GetStringSelection() const; virtual wxString GetStringSelection() const;
virtual bool SetStringSelection(const wxString& s); virtual bool SetStringSelection(const wxString& s);
virtual int Number() const { return m_noItems; } ; virtual int Number() const { return m_noItems; };
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event);
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
@@ -120,15 +89,21 @@ public:
// Implementation // Implementation
WXHWND *GetRadioButtons() const { return m_radioButtons; } WXHWND *GetRadioButtons() const { return m_radioButtons; }
bool ContainsHWND(WXHWND hWnd) const ; bool ContainsHWND(WXHWND hWnd) const;
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
// get the number of buttons per column/row
inline int GetNumVer() const;
inline int GetNumHor() const;
protected: protected:
void SubclassRadioButton(WXHWND hWndBtn);
WXHWND * m_radioButtons; WXHWND * m_radioButtons;
int m_majorDim ; int m_majorDim;
int * m_radioWidth ; // for bitmaps int * m_radioWidth; // for bitmaps
int * m_radioHeight ; int * m_radioHeight;
int m_noItems; int m_noItems;
int m_noRowsOrCols; int m_noRowsOrCols;

29
src/msw/listctrl.cpp
View File

@@ -1059,22 +1059,37 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
lvCol.fmt = LVCFMT_CENTER; lvCol.fmt = LVCFMT_CENTER;
} }
lvCol.mask |= LVCF_WIDTH;
if ( item.m_mask & wxLIST_MASK_WIDTH ) if ( item.m_mask & wxLIST_MASK_WIDTH )
{ {
lvCol.mask |= LVCF_WIDTH; if ( item.m_width == wxLIST_AUTOSIZE)
lvCol.cx = item.m_width;
if ( lvCol.cx == wxLIST_AUTOSIZE)
lvCol.cx = LVSCW_AUTOSIZE; lvCol.cx = LVSCW_AUTOSIZE;
else if ( lvCol.cx == wxLIST_AUTOSIZE_USEHEADER) else if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER)
lvCol.cx = LVSCW_AUTOSIZE_USEHEADER; lvCol.cx = LVSCW_AUTOSIZE_USEHEADER;
else
lvCol.cx = item.m_width;
} }
else
{
// always give some width to the new column: this one is compatible
// with wxGTK
lvCol.cx = 80;
}
lvCol.mask |= LVCF_SUBITEM; lvCol.mask |= LVCF_SUBITEM;
lvCol.iSubItem = col; lvCol.iSubItem = col;
bool success = (ListView_InsertColumn((HWND) GetHWND(), col, & lvCol) != 0); bool success = ListView_InsertColumn((HWND) GetHWND(), col, & lvCol) != -1;
if ( success ) if ( success )
m_colCount ++; {
m_colCount++;
}
else
{
wxLogDebug("Failed to insert the column '%s' into listview!",
lvCol.pszText);
}
return success; return success;
} }

667
src/msw/radiobox.cpp
View File

@@ -9,6 +9,14 @@
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// declarations
// ===========================================================================
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "radiobox.h" #pragma implementation "radiobox.h"
#endif #endif
@@ -34,29 +42,89 @@
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
#endif #endif
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
// get the id of the window
#ifdef __WIN32__
#define GET_WIN_ID(hwnd) ::GetWindowLong((HWND)hwnd, GWL_ID)
#else // Win16
#define GET_WIN_ID(hwnd) ::GetWindowWord((HWND)hwnd, GWW_ID)
#endif // Win32/16
// wnd proc for radio buttons
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
UINT message,
WPARAM wParam,
LPARAM lParam);
// ---------------------------------------------------------------------------
// global vars
// ---------------------------------------------------------------------------
// the pointer to standard radio button wnd proc
static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL;
// ===========================================================================
// implementation
// ===========================================================================
// ---------------------------------------------------------------------------
// wxRadioBox
// ---------------------------------------------------------------------------
int wxRadioBox::GetNumVer() const
{
if ( m_windowStyle & wxRA_SPECIFY_ROWS )
{
return m_majorDim;
}
else
{
return (m_noItems + m_majorDim - 1)/m_majorDim;
}
}
int wxRadioBox::GetNumHor() const
{
if ( m_windowStyle & wxRA_SPECIFY_ROWS )
{
return (m_noItems + m_majorDim - 1)/m_majorDim;
}
else
{
return m_majorDim;
}
}
bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id) bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
{ {
if (param == BN_CLICKED) if ( param == BN_CLICKED )
{ {
#ifdef __WIN32__ m_selectedButton = -1;
int i;
for (i = 0; i < m_noItems; i++) for ( int i = 0; i < m_noItems; i++ )
if (id == GetWindowLong((HWND) m_radioButtons[i], GWL_ID)) {
if ( id == GET_WIN_ID(m_radioButtons[i]) )
{
m_selectedButton = i; m_selectedButton = i;
#else
int i; break;
for (i = 0; i < m_noItems; i++) }
if (id == GetWindowWord((HWND) m_radioButtons[i], GWW_ID)) }
m_selectedButton = i;
#endif wxASSERT_MSG( m_selectedButton != -1, "click from alien button?" );
wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
event.SetInt( m_selectedButton ); event.SetInt( m_selectedButton );
event.SetEventObject( this ); event.SetEventObject( this );
ProcessCommand(event); ProcessCommand(event);
return TRUE; return TRUE;
} }
else return FALSE; else
return FALSE;
} }
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
@@ -76,15 +144,15 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
#endif #endif
// Radio box item // Radio box item
wxRadioBox::wxRadioBox(void) wxRadioBox::wxRadioBox()
{ {
m_selectedButton = -1; m_selectedButton = -1;
m_noItems = 0; m_noItems = 0;
m_noRowsOrCols = 0; m_noRowsOrCols = 0;
m_radioButtons = NULL; m_radioButtons = NULL;
m_majorDim = 0 ; m_majorDim = 0;
m_radioWidth = NULL ; m_radioWidth = NULL;
m_radioHeight = NULL ; m_radioHeight = NULL;
} }
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -100,8 +168,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
SetValidator(val); SetValidator(val);
parent->AddChild(this); parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ; m_backgroundColour = parent->GetBackgroundColour();
m_foregroundColour = parent->GetForegroundColour() ; m_foregroundColour = parent->GetForegroundColour();
m_windowStyle = (long&)style; m_windowStyle = (long&)style;
@@ -115,16 +183,16 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
else else
m_windowId = id; m_windowId = id;
if ( majorDim == 0 )
m_majorDim = n;
else
m_majorDim = majorDim;
m_noRowsOrCols = majorDim; m_noRowsOrCols = majorDim;
if (majorDim==0)
m_majorDim = n ;
else // Seemed to make sense to put this 'else' here... (RD)
m_majorDim = majorDim ;
long msStyle = GROUP_FLAGS; long msStyle = GROUP_FLAGS;
bool want3D; bool want3D;
WXDWORD exStyle = Determine3DEffects(0, &want3D) ; WXDWORD exStyle = Determine3DEffects(0, &want3D);
// Even with extended styles, need to combine with WS_BORDER // Even with extended styles, need to combine with WS_BORDER
// for them to look right. // for them to look right.
/* /*
@@ -132,21 +200,20 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
msStyle |= WS_BORDER; msStyle |= WS_BORDER;
*/ */
HWND hwndParent = (HWND)parent->GetHWND();
HWND the_handle = (HWND) parent->GetHWND() ;
m_hWnd = (WXHWND)::CreateWindowEx m_hWnd = (WXHWND)::CreateWindowEx
( (
(DWORD)exStyle, (DWORD)exStyle,
GROUP_CLASS, GROUP_CLASS,
title, title,
msStyle, msStyle,
0, 0, 0, 0, 0, 0, 0, 0,
the_handle, hwndParent,
(HMENU)m_windowId, (HMENU)m_windowId,
wxGetInstance(), wxGetInstance(),
NULL NULL
); );
#if wxUSE_CTL3D #if wxUSE_CTL3D
if (want3D) if (want3D)
@@ -154,47 +221,51 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
Ctl3dSubclassCtl((HWND)m_hWnd); Ctl3dSubclassCtl((HWND)m_hWnd);
m_useCtl3D = TRUE; m_useCtl3D = TRUE;
} }
#endif #endif // wxUSE_CTL3D
SetFont(parent->GetFont()); SetFont(parent->GetFont());
SubclassWin((WXHWND)m_hWnd); SubclassWin(m_hWnd);
// Some radio boxes test consecutive id. // Some radio boxes test consecutive id.
(void)NewControlId() ; (void)NewControlId();
m_radioButtons = new WXHWND[n]; m_radioButtons = new WXHWND[n];
m_radioWidth = new int[n] ; m_radioWidth = new int[n];
m_radioHeight = new int[n] ; m_radioHeight = new int[n];
int i; int i;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
m_radioWidth[i] = m_radioHeight[i] = -1 ; m_radioWidth[i] = m_radioHeight[i] = -1;
long groupStyle = 0; long groupStyle = 0;
if (i == 0 && style==0) if ( i == 0 && style == 0 )
groupStyle = WS_GROUP; groupStyle = WS_GROUP;
long newId = NewControlId(); long newId = NewControlId();
long msStyle = groupStyle | RADIO_FLAGS; long msStyle = groupStyle | RADIO_FLAGS;
m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, choices[i], HWND hwndBtn = CreateWindowEx(exStyle, RADIO_CLASS,
msStyle,0,0,0,0, choices[i], msStyle,
the_handle, (HMENU)newId, wxGetInstance(), NULL); 0,0,0,0,
#if wxUSE_CTL3D hwndParent,
if (want3D) (HMENU)newId, wxGetInstance(),
NULL);
m_radioButtons[i] = (WXHWND)hwndBtn;
SubclassRadioButton((WXHWND)hwndBtn);
wxFont& font = GetFont();
if ( font.Ok() )
{ {
Ctl3dSubclassCtl((HWND) m_hWnd); SendMessage(hwndBtn, WM_SETFONT,
m_useCtl3D = TRUE; (WPARAM)font.GetResourceHandle(), 0L);
}
#endif
if (GetFont().Ok())
{
SendMessage((HWND)m_radioButtons[i],WM_SETFONT,
(WPARAM)GetFont().GetResourceHandle(),0L);
} }
m_subControls.Append((wxObject *)newId); m_subControls.Append((wxObject *)newId);
} }
// Create a dummy radio control to end the group. // Create a dummy radio control to end the group.
(void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL); (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP | RADIO_FLAGS,
0, 0, 0, 0, hwndParent,
(HMENU)NewControlId(), wxGetInstance(), NULL);
SetSelection(0); SetSelection(0);
@@ -203,113 +274,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
return TRUE; return TRUE;
} }
#if 0 wxRadioBox::~wxRadioBox()
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
int n, const wxBitmap *choices[],
int majorDim, long style,
const wxValidator& val, const wxString& name)
{
m_selectedButton = -1;
m_noRowsOrCols = 0;
m_noItems = n;
SetName(name);
SetValidator(val);
parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ;
m_windowStyle = (long&)style;
int x = pos.x;
int y = pos.y;
int width = size.x;
int height = size.y;
if (id == -1)
m_windowId = NewControlId();
else
m_windowId = id;
m_noRowsOrCols = majorDim;
if (majorDim==0)
m_majorDim = n ;
m_majorDim = majorDim ;
HWND the_handle ;
long msStyle = GROUP_FLAGS;
bool want3D;
WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
// Even with extended styles, need to combine with WS_BORDER
// for them to look right.
if ( want3D || wxStyleHasBorder(m_windowStyle) )
msStyle |= WS_BORDER;
m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),
msStyle,
0,0,0,0,
(HWND) parent->GetHWND(), (HMENU) m_windowId, wxGetInstance(), NULL) ;
the_handle = (HWND) parent->GetHWND();
#if wxUSE_CTL3D
if (want3D)
{
Ctl3dSubclassCtl((HWND) m_hWnd);
m_useCtl3D = TRUE;
}
#endif
SetFont(parent->GetFont());
// Subclass again for purposes of dialog editing mode
SubclassWin((WXHWND)m_hWnd);
(void)NewControlId() ;
m_radioButtons = new WXHWND[n];
m_radioWidth = new int[n] ;
m_radioHeight = new int[n] ;
int i;
for (i = 0; i < n; i++)
{
long groupStyle = 0;
if (i == 0 && style==0)
groupStyle = WS_GROUP;
long newId = NewControlId();
m_radioWidth[i] = ((wxBitmap *)choices[i])->GetWidth();
m_radioHeight[i] = ((wxBitmap *)choices[i])->GetHeight();
char tmp[32] ;
sprintf(tmp,"Toggle%d",i) ;
long msStyle = groupStyle | RADIO_FLAGS;
m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, tmp,
msStyle,0,0,0,0,
the_handle, (HMENU)newId, wxhInstance, NULL);
#if wxUSE_CTL3D
if (want3D)
{
Ctl3dSubclassCtl((HWND) m_hWnd);
m_useCtl3D = TRUE;
}
#endif
m_subControls.Append((wxObject *)newId);
}
// Create a dummy radio control to end the group.
(void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);
SetSelection(0);
SetSize(x, y, width, height);
return TRUE;
}
#endif
wxRadioBox::~wxRadioBox(void)
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
@@ -321,12 +286,12 @@ wxRadioBox::~wxRadioBox(void)
delete[] m_radioButtons; delete[] m_radioButtons;
} }
if (m_radioWidth) if (m_radioWidth)
delete[] m_radioWidth ; delete[] m_radioWidth;
if (m_radioHeight) if (m_radioHeight)
delete[] m_radioHeight ; delete[] m_radioHeight;
if (m_hWnd) if (m_hWnd)
::DestroyWindow((HWND) m_hWnd) ; ::DestroyWindow((HWND) m_hWnd);
m_hWnd = 0 ; m_hWnd = 0;
} }
@@ -338,15 +303,15 @@ wxString wxRadioBox::GetLabel(int item) const
void wxRadioBox::SetLabel(int item, const wxString& label) void wxRadioBox::SetLabel(int item, const wxString& label)
{ {
m_radioWidth[item] = m_radioHeight[item] = -1 ; m_radioWidth[item] = m_radioHeight[item] = -1;
SetWindowText((HWND)m_radioButtons[item], (const char *)label); SetWindowText((HWND)m_radioButtons[item], (const char *)label);
} }
void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
{ {
/* /*
m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN ; m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN ; m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;
*/ */
} }
@@ -364,19 +329,20 @@ int wxRadioBox::FindString(const wxString& s) const
void wxRadioBox::SetSelection(int N) void wxRadioBox::SetSelection(int N)
{ {
if ((N < 0) || (N >= m_noItems)) wxCHECK_RET( (N >= 0) && (N < m_noItems), "invalid radiobox index" );
return;
// Following necessary for Win32s, because Win32s translate BM_SETCHECK // Following necessary for Win32s, because Win32s translate BM_SETCHECK
if (m_selectedButton >= 0 && m_selectedButton < m_noItems) if (m_selectedButton >= 0 && m_selectedButton < m_noItems)
SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L); ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);
::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
::SetFocus((HWND)m_radioButtons[N]);
SendMessage((HWND) m_radioButtons[N], BM_SETCHECK, 1, 0L);
m_selectedButton = N; m_selectedButton = N;
} }
// Get single selection, for single choice list items // Get single selection, for single choice list items
int wxRadioBox::GetSelection(void) const int wxRadioBox::GetSelection() const
{ {
return m_selectedButton; return m_selectedButton;
} }
@@ -384,194 +350,9 @@ int wxRadioBox::GetSelection(void) const
// Find string for position // Find string for position
wxString wxRadioBox::GetString(int N) const wxString wxRadioBox::GetString(int N) const
{ {
GetWindowText((HWND) m_radioButtons[N], wxBuffer, 1000); return wxGetWindowText(m_radioButtons[N]);
return wxString(wxBuffer);
} }
/* NOTE. The contributed code to size the group box according to the
* given size simply didn't work (try it in e.g. Dialog Editor)
* so sorry, I'm removing it. If you reinstate it, please make sure
* it's bullet-proof in Dialog Editor. Meanwhile, it's better to have it
* working with a calculated size, than supposedly flexibly but
* actually broken. This is rather important when it comes to releasing
* stable software. Suggestion: if you modify this, rewrite it completely.
* -- JACS 7/2/99
*/
#if 0
void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(&currentX, &currentY);
int xx = x;
int yy = y;
if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
xx = currentX;
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
yy = currentY;
AdjustForParentClientOrigin(xx, yy, sizeFlags);
wxString textRadioButton;
int y_offset = yy;
int x_offset = xx;
int current_width, cyf;
int cx1,cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, & this->GetFont());
// number of radio boxes in both directions
int nbHor, nbVer;
if (m_windowStyle & wxRA_SPECIFY_ROWS)
{
nbVer = m_majorDim ;
nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;
}
else
{
nbHor = m_majorDim ;
nbVer = (m_noItems+m_majorDim-1)/m_majorDim ;
}
// Attempt to have a look coherent with other platforms:
// We compute the biggest toggle dim, then we align all
// items according this value.
int maxWidth = width,
maxHeight = height;
// if we're given the width or height explicitly do not recalculate it, but
// use what we have
bool calcWidth = maxWidth == -1,
calcHeight = maxHeight == -1;
if ( calcWidth || calcHeight )
{
// init vars to avoid compiler warnings, even if we don't use them
int eachWidth = 0,
eachHeight = 0;
for ( int i = 0 ; i < m_noItems; i++ )
{
if ( m_radioWidth[i] < 0 )
{
// It's a labelled toggle
textRadioButton = wxGetWindowText(m_radioButtons[i]);
GetTextExtent(textRadioButton, &current_width, &cyf,
NULL, NULL, &GetFont());
if ( calcWidth )
eachWidth = current_width + RADIO_SIZE;
if ( calcHeight )
eachHeight = (3*cyf)/2;
}
else
{
if ( calcWidth )
eachWidth = m_radioWidth[i] ;
if ( calcHeight )
eachHeight = m_radioHeight[i] ;
}
if ( calcWidth && maxWidth < eachWidth )
maxWidth = eachWidth;
if ( calcHeight && maxHeight < eachHeight )
maxHeight = eachHeight;
}
}
else
{
maxHeight = height/nbVer;
maxWidth = width/nbHor;
}
if (m_hWnd)
{
int totWidth ;
int totHeight;
// this formula works, but I don't know why.
// Please, be sure what you do if you modify it!!
if (m_radioWidth[0]<0)
totHeight = (nbVer * maxHeight) + cy1/2 ;
else
totHeight = nbVer * (maxHeight+cy1/2) ;
totWidth = nbHor * (maxWidth+cx1) ;
#if !defined(__WIN32__) && (!wxUSE_CTL3D)
// Requires a bigger group box in plain Windows
MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ;
#else
MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE) ;
#endif
x_offset += cx1;
y_offset += cy1;
}
#if !defined(__WIN32__) && (!wxUSE_CTL3D)
y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
// JACS 2/12/93. CTL3D draws group label quite high.
#endif
int startX = x_offset ;
int startY = y_offset ;
for ( int i = 0 ; i < m_noItems; i++)
{
// Bidimensional radio adjustment
if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
{
if (m_windowStyle & wxRA_SPECIFY_ROWS)
{
y_offset = startY;
x_offset += maxWidth + cx1 ;
}
else
{
x_offset = startX ;
y_offset += maxHeight ;
if (m_radioWidth[0]>0)
y_offset += cy1/2 ;
}
}
int eachWidth;
int eachHeight;
if ( m_radioWidth[i] < 0 )
{
// It's a labeled item
textRadioButton = wxGetWindowText(m_radioButtons[i]);
GetTextExtent(textRadioButton, &current_width, &cyf,
NULL,NULL, & this->GetFont());
eachWidth = current_width + RADIO_SIZE;
eachHeight = (3*cyf)/2;
}
else
{
eachWidth = m_radioWidth[i] ;
eachHeight = m_radioHeight[i] ;
}
MoveWindow((HWND)m_radioButtons[i], x_offset, y_offset,
eachWidth,eachHeight,TRUE);
if ( m_windowStyle & wxRA_VERTICAL )
if (m_windowStyle & wxRA_SPECIFY_ROWS)
{
y_offset += maxHeight;
if ( m_radioWidth[0] > 0 )
y_offset += cy1/2 ;
}
else
{
x_offset += maxWidth + cx1;
}
}
}
#endif
// Restored old code. // Restored old code.
void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{ {
@@ -591,19 +372,19 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int x_offset = xx; int x_offset = xx;
int current_width, cyf; int current_width, cyf;
int cx1,cy1 ; int cx1,cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont()); wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
// Attempt to have a look coherent with other platforms: // Attempt to have a look coherent with other platforms:
// We compute the biggest toggle dim, then we align all // We compute the biggest toggle dim, then we align all
// items according this value. // items according this value.
int maxWidth = -1; int maxWidth = -1;
int maxHeight = -1 ; int maxHeight = -1;
int i; int i;
for (i = 0 ; i < m_noItems; i++) for (i = 0 ; i < m_noItems; i++)
{ {
int eachWidth; int eachWidth;
int eachHeight ; int eachHeight;
if (m_radioWidth[i]<0) if (m_radioWidth[i]<0)
{ {
// It's a labelled toggle // It's a labelled toggle
@@ -614,44 +395,34 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
} }
else else
{ {
eachWidth = m_radioWidth[i] ; eachWidth = m_radioWidth[i];
eachHeight = m_radioHeight[i] ; eachHeight = m_radioHeight[i];
} }
if (maxWidth<eachWidth) maxWidth = eachWidth ; if (maxWidth<eachWidth) maxWidth = eachWidth;
if (maxHeight<eachHeight) maxHeight = eachHeight ; if (maxHeight<eachHeight) maxHeight = eachHeight;
} }
if (m_hWnd) if (m_hWnd)
{ {
int totWidth ; int totWidth;
int totHeight; int totHeight;
int nbHor,nbVer; int nbHor = GetNumHor(),
nbVer = GetNumVer();
if (m_windowStyle & wxRA_SPECIFY_ROWS)
{
nbVer = m_majorDim ;
nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;
}
else
{
nbHor = m_majorDim ;
nbVer = (m_noItems+m_majorDim-1)/m_majorDim ;
}
// this formula works, but I don't know why. // this formula works, but I don't know why.
// Please, be sure what you do if you modify it!! // Please, be sure what you do if you modify it!!
if (m_radioWidth[0]<0) if (m_radioWidth[0]<0)
totHeight = (nbVer * maxHeight) + cy1/2 ; totHeight = (nbVer * maxHeight) + cy1/2;
else else
totHeight = nbVer * (maxHeight+cy1/2) ; totHeight = nbVer * (maxHeight+cy1/2);
totWidth = nbHor * (maxWidth+cx1) ; totWidth = nbHor * (maxWidth+cx1);
#if (!CTL3D) #if (!CTL3D)
// Requires a bigger group box in plain Windows // Requires a bigger group box in plain Windows
MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ; MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE);
#else #else
MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE) ; MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE);
#endif #endif
x_offset += cx1; x_offset += cx1;
y_offset += cy1; y_offset += cy1;
@@ -661,8 +432,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
// JACS 2/12/93. CTL3D draws group label quite high. // JACS 2/12/93. CTL3D draws group label quite high.
#endif #endif
int startX = x_offset ; int startX = x_offset;
int startY = y_offset ; int startY = y_offset;
for ( i = 0 ; i < m_noItems; i++) for ( i = 0 ; i < m_noItems; i++)
{ {
@@ -672,18 +443,18 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
if (m_windowStyle & wxRA_VERTICAL) if (m_windowStyle & wxRA_VERTICAL)
{ {
y_offset = startY; y_offset = startY;
x_offset += maxWidth + cx1 ; x_offset += maxWidth + cx1;
} }
else else
{ {
x_offset = startX ; x_offset = startX;
y_offset += maxHeight ; y_offset += maxHeight;
if (m_radioWidth[0]>0) if (m_radioWidth[0]>0)
y_offset += cy1/2 ; y_offset += cy1/2;
} }
} }
int eachWidth ; int eachWidth;
int eachHeight ; int eachHeight;
if (m_radioWidth[i]<0) if (m_radioWidth[i]<0)
{ {
// It's a labeled item // It's a labeled item
@@ -697,8 +468,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
} }
else else
{ {
eachWidth = m_radioWidth[i] ; eachWidth = m_radioWidth[i];
eachHeight = m_radioHeight[i] ; eachHeight = m_radioHeight[i];
} }
MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE); MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
@@ -706,7 +477,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{ {
y_offset += maxHeight; y_offset += maxHeight;
if (m_radioWidth[0]>0) if (m_radioWidth[0]>0)
y_offset += cy1/2 ; y_offset += cy1/2;
} }
else else
x_offset += maxWidth + cx1; x_offset += maxWidth + cx1;
@@ -766,7 +537,7 @@ void wxRadioBox::GetPosition(int *x, int *y) const
*y = point.y; *y = point.y;
} }
wxString wxRadioBox::GetLabel(void) const wxString wxRadioBox::GetLabel() const
{ {
if (m_hWnd) if (m_hWnd)
{ {
@@ -782,7 +553,7 @@ void wxRadioBox::SetLabel(const wxString& label)
SetWindowText((HWND) m_hWnd, label); SetWindowText((HWND) m_hWnd, label);
} }
void wxRadioBox::SetFocus(void) void wxRadioBox::SetFocus()
{ {
if (m_noItems > 0) if (m_noItems > 0)
{ {
@@ -814,7 +585,7 @@ bool wxRadioBox::Show(bool show)
void wxRadioBox::Enable(int item, bool enable) void wxRadioBox::Enable(int item, bool enable)
{ {
if (item<0) if (item<0)
wxWindow::Enable(enable) ; wxWindow::Enable(enable);
else if (item < m_noItems) else if (item < m_noItems)
::EnableWindow((HWND) m_radioButtons[item], enable); ::EnableWindow((HWND) m_radioButtons[item], enable);
} }
@@ -833,7 +604,7 @@ void wxRadioBox::Enable(bool enable)
void wxRadioBox::Show(int item, bool show) void wxRadioBox::Show(int item, bool show)
{ {
if (item<0) if (item<0)
wxRadioBox::Show(show) ; wxRadioBox::Show(show);
else if (item < m_noItems) else if (item < m_noItems)
{ {
int cshow; int cshow;
@@ -873,16 +644,17 @@ WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
} }
// For single selection items only // For single selection items only
wxString wxRadioBox::GetStringSelection (void) const wxString wxRadioBox::GetStringSelection() const
{ {
int sel = GetSelection (); wxString result;
int sel = GetSelection();
if (sel > -1) if (sel > -1)
return this->GetString (sel); result = GetString(sel);
else
return wxString(""); return result;
} }
bool wxRadioBox::SetStringSelection (const wxString& s) bool wxRadioBox::SetStringSelection(const wxString& s)
{ {
int sel = FindString (s); int sel = FindString (s);
if (sel > -1) if (sel > -1)
@@ -927,3 +699,82 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
return wxControl::MSWWindowProc(nMsg, wParam, lParam); return wxControl::MSWWindowProc(nMsg, wParam, lParam);
} }
void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
{
HWND hwndBtn = (HWND)hWndBtn;
if ( !s_wndprocRadioBtn )
s_wndprocRadioBtn = (WNDPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
}
// ---------------------------------------------------------------------------
// window proc for radio buttons
// ---------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
UINT msg,
WPARAM wParam,
LPARAM lParam)
{
bool processed = TRUE;
if ( msg != WM_KEYDOWN )
processed = FALSE;
if ( processed )
{
wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA);
wxCHECK_MSG( radiobox, 0, "radio button without radio box?" );
int sel = radiobox->GetSelection();
switch ( wParam )
{
case VK_UP:
sel--;
break;
case VK_LEFT:
sel -= radiobox->GetNumVer();
break;
case VK_DOWN:
sel++;
break;
case VK_RIGHT:
sel += radiobox->GetNumVer();
break;
case VK_TAB:
{
wxNavigationKeyEvent event;
event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
event.SetWindowChange(FALSE);
event.SetEventObject(radiobox);
if ( radiobox->GetEventHandler()->ProcessEvent(event) )
return 0;
}
// fall through
default:
processed = FALSE;
}
if ( processed )
{
if ( sel >= 0 && sel < radiobox->Number() )
radiobox->SetSelection(sel);
}
}
if ( !processed )
return ::CallWindowProc(s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
else
return 0;
}