added wxStaticLine used in wxMessageBox
added wxNO_BORDER style to radiobox git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
aa64626e23
commit
b0351fc91e
@ -535,7 +535,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
|
||||
#define wxSB_VERTICAL wxVERTICAL
|
||||
|
||||
/*
|
||||
* wxButton flags
|
||||
* wxButton flags (Win32 only)
|
||||
*/
|
||||
#define wxBU_AUTODRAW 0x0004
|
||||
#define wxBU_NOAUTODRAW 0x0000
|
||||
@ -619,6 +619,14 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
|
||||
|
||||
#define wxST_SIZEGRIP 0x0002
|
||||
|
||||
/*
|
||||
* wxStaticLine flags
|
||||
*/
|
||||
#define wxLI_HORIZONTAL wxHORIZONTAL
|
||||
#define wxLI_VERTICAL wxVERTICAL
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* GDI descriptions
|
||||
*/
|
||||
|
55
include/wx/gtk/statline.h
Normal file
55
include/wx/gtk/statline.h
Normal file
@ -0,0 +1,55 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: statline.h
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
#ifndef __GTKSTATICLINEH__
|
||||
#define __GTKSTATICLINEH__
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/object.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/control.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxStaticLine;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxStaticTextNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxStaticLine
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxStaticLine: public wxControl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxStaticLine)
|
||||
|
||||
public:
|
||||
|
||||
wxStaticLine(void);
|
||||
wxStaticLine( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
|
||||
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
|
||||
bool Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
|
||||
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
|
||||
|
||||
};
|
||||
|
||||
#endif // __GTKSTATICLINEH__
|
55
include/wx/gtk1/statline.h
Normal file
55
include/wx/gtk1/statline.h
Normal file
@ -0,0 +1,55 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: statline.h
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
#ifndef __GTKSTATICLINEH__
|
||||
#define __GTKSTATICLINEH__
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/object.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/control.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxStaticLine;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxStaticTextNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxStaticLine
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxStaticLine: public wxControl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxStaticLine)
|
||||
|
||||
public:
|
||||
|
||||
wxStaticLine(void);
|
||||
wxStaticLine( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
|
||||
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
|
||||
bool Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
|
||||
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
|
||||
|
||||
};
|
||||
|
||||
#endif // __GTKSTATICLINEH__
|
19
include/wx/statline.h
Normal file
19
include/wx/statline.h
Normal file
@ -0,0 +1,19 @@
|
||||
#ifndef _WX_STATLINE_H_BASE_
|
||||
#define _WX_STATLINE_H_BASE_
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#include "wx/msw/statline.h"
|
||||
#elif defined(__WXMOTIF__)
|
||||
#include "wx/motif/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"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
// _WX_STATLINE_H_BASE_
|
@ -35,6 +35,10 @@
|
||||
|
||||
#include "wx/generic/msgdlgg.h"
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#include "wx/statline.h"
|
||||
#endif
|
||||
|
||||
///////////////////////////////////////////////////////////////////
|
||||
// New dialog box implementations
|
||||
|
||||
@ -146,6 +150,10 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
|
||||
n++;
|
||||
}
|
||||
|
||||
#ifdef __WXGTK__
|
||||
(void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
|
||||
#endif
|
||||
|
||||
SetSize( w+30, y+40 );
|
||||
|
||||
Centre( wxBOTH );
|
||||
|
@ -122,6 +122,7 @@ LIB_CPP_SRC=\
|
||||
gtk/spinbutt.cpp \
|
||||
gtk/statbox.cpp \
|
||||
gtk/statbmp.cpp \
|
||||
gtk/statline.cpp \
|
||||
gtk/stattext.cpp \
|
||||
gtk/tbargtk.cpp \
|
||||
gtk/textctrl.cpp \
|
||||
|
@ -249,6 +249,9 @@ bool wxRadioBox::Show( bool show )
|
||||
|
||||
wxWindow::Show( show );
|
||||
|
||||
if ((m_windowStyle & wxNO_BORDER) == 0)
|
||||
gtk_widget_hide( m_widget );
|
||||
|
||||
wxNode *node = m_boxes.First();
|
||||
while (node)
|
||||
{
|
||||
|
59
src/gtk/statline.cpp
Normal file
59
src/gtk/statline.cpp
Normal file
@ -0,0 +1,59 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: statline.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "statline.h"
|
||||
#endif
|
||||
|
||||
#include "wx/statline.h"
|
||||
|
||||
#include "gdk/gdk.h"
|
||||
#include "gtk/gtk.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxStaticLine
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticLine,wxControl)
|
||||
|
||||
wxStaticLine::wxStaticLine(void)
|
||||
{
|
||||
}
|
||||
|
||||
wxStaticLine::wxStaticLine( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
long style, const wxString &name )
|
||||
{
|
||||
Create( parent, id, pos, size, style, name );
|
||||
}
|
||||
|
||||
bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
long style, const wxString &name )
|
||||
{
|
||||
m_needParent = TRUE;
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
if (style & wxVERTICAL)
|
||||
m_widget = gtk_vseparator_new();
|
||||
else
|
||||
m_widget = gtk_hseparator_new();
|
||||
|
||||
m_parent->AddChild( this );
|
||||
|
||||
(m_parent->m_insertCallback)( m_parent, this );
|
||||
|
||||
PostCreation();
|
||||
|
||||
Show( TRUE );
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -249,6 +249,9 @@ bool wxRadioBox::Show( bool show )
|
||||
|
||||
wxWindow::Show( show );
|
||||
|
||||
if ((m_windowStyle & wxNO_BORDER) == 0)
|
||||
gtk_widget_hide( m_widget );
|
||||
|
||||
wxNode *node = m_boxes.First();
|
||||
while (node)
|
||||
{
|
||||
|
59
src/gtk1/statline.cpp
Normal file
59
src/gtk1/statline.cpp
Normal file
@ -0,0 +1,59 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: statline.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "statline.h"
|
||||
#endif
|
||||
|
||||
#include "wx/statline.h"
|
||||
|
||||
#include "gdk/gdk.h"
|
||||
#include "gtk/gtk.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxStaticLine
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticLine,wxControl)
|
||||
|
||||
wxStaticLine::wxStaticLine(void)
|
||||
{
|
||||
}
|
||||
|
||||
wxStaticLine::wxStaticLine( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
long style, const wxString &name )
|
||||
{
|
||||
Create( parent, id, pos, size, style, name );
|
||||
}
|
||||
|
||||
bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
long style, const wxString &name )
|
||||
{
|
||||
m_needParent = TRUE;
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
if (style & wxVERTICAL)
|
||||
m_widget = gtk_vseparator_new();
|
||||
else
|
||||
m_widget = gtk_hseparator_new();
|
||||
|
||||
m_parent->AddChild( this );
|
||||
|
||||
(m_parent->m_insertCallback)( m_parent, this );
|
||||
|
||||
PostCreation();
|
||||
|
||||
Show( TRUE );
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user