1. wxStaticLine implemented (generic (ugly) and MSW versions)
2. wxTextDialog looks fine under MSW again 3. startup tips added: code, sample, docs 4. read-only text controls don't participate in TAB traversal git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,19 +1,74 @@
|
||||
#ifndef _WX_STATLINE_H_BASE_
|
||||
#define _WX_STATLINE_H_BASE_
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// this defines wxUSE_STATLINE
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_STATLINE
|
||||
|
||||
// the base class declaration
|
||||
#include "wx/control.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// global variables
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// the default name for objects of class wxStaticLine
|
||||
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxStaticLine - a line in a dialog
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxStaticLineBase : public wxControl
|
||||
{
|
||||
public:
|
||||
// constructor
|
||||
wxStaticLineBase() { }
|
||||
|
||||
// is the line vertical?
|
||||
bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
|
||||
|
||||
// get the default size for the "lesser" dimension of the static line
|
||||
static int GetDefaultSize() { return 2; }
|
||||
|
||||
protected:
|
||||
// set the right size for the right dimension
|
||||
wxSize AdjustSize(const wxSize& size)
|
||||
{
|
||||
wxSize sizeReal(size);
|
||||
if ( IsVertical() )
|
||||
{
|
||||
if ( size.x == -1 )
|
||||
sizeReal.x = GetDefaultSize();
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( size.y == -1 )
|
||||
sizeReal.y = GetDefaultSize();
|
||||
}
|
||||
|
||||
return sizeReal;
|
||||
}
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// now include the actual class declaration
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#include "wx/msw/statline.h"
|
||||
#elif defined(__WXMOTIF__)
|
||||
#include "wx/motif/statline.h"
|
||||
#include "wx/msw/statline.h"
|
||||
#elif defined(__WXGTK__)
|
||||
#include "wx/gtk/statline.h"
|
||||
#elif defined(__WXQT__)
|
||||
#include "wx/qt/statline.h"
|
||||
#elif defined(__WXMAC__)
|
||||
#include "wx/mac/statline.h"
|
||||
#elif defined(__WXSTUBS__)
|
||||
#include "wx/stubs/statline.h"
|
||||
#include "wx/gtk/statline.h"
|
||||
#else // use generic implementation for all other platforms
|
||||
#include "wx/generic/statline.h"
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_STATLINE
|
||||
|
||||
#endif
|
||||
// _WX_STATLINE_H_BASE_
|
||||
|
Reference in New Issue
Block a user