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

very minor changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-31 23:49:57 +00:00
parent 3a19e16d18
commit 396bdd5ab1
2 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
include/wx/msw/stattext.h
View File

@@ -13,54 +13,56 @@
#define _WX_STATTEXT_H_ #define _WX_STATTEXT_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface "stattext.h" #pragma interface "stattext.h"
#endif #endif
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
class WXDLLEXPORT wxStaticText: public wxControl class WXDLLEXPORT wxStaticText : public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxStaticText) DECLARE_DYNAMIC_CLASS(wxStaticText)
public:
inline wxStaticText(void) { }
inline wxStaticText(wxWindow *parent, wxWindowID id, public:
const wxString& label, wxStaticText() { }
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, wxStaticText(wxWindow *parent, wxWindowID id,
long style = 0, const wxString& label,
const wxString& name = wxStaticTextNameStr) const wxPoint& pos = wxDefaultPosition,
{ const wxSize& size = wxDefaultSize,
Create(parent, id, label, pos, size, style, name); long style = 0,
} const wxString& name = wxStaticTextNameStr)
{
bool Create(wxWindow *parent, wxWindowID id, Create(parent, id, label, pos, size, style, name);
const wxString& label, }
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, bool Create(wxWindow *parent, wxWindowID id,
long style = 0, const wxString& label,
const wxString& name = wxStaticTextNameStr); const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
// accessors long style = 0,
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); const wxString& name = wxStaticTextNameStr);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
// accessors
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); } { wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); } void SetSize(const wxSize& size)
void SetLabel(const wxString&); { wxWindow::SetSize(size); }
void SetLabel(const wxString& label);
// operations
virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; // operations
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; } // overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
// callbacks
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, // callbacks
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
}; };
#endif #endif

24
include/wx/msw/textctrl.h
View File

@@ -13,15 +13,22 @@
#define _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface "textctrl.h" #pragma interface "textctrl.h"
#endif #endif
#include "wx/setup.h"
#include "wx/control.h" #include "wx/control.h"
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else
#include <iostream> #include <iostream>
#endif
#if defined(__WIN95__) && !defined(__TWIN32__)
#define wxUSE_RICHEDIT 1
#else
#define wxUSE_RICHEDIT 0
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
@@ -138,8 +145,12 @@ public:
// -------------- // --------------
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
inline bool IsRich() const { return m_isRich; }
inline void SetRichEdit(bool isRich) { m_isRich = isRich; } #if wxUSE_RICHEDIT
bool IsRich() const { return m_isRich; }
void SetRichEdit(bool isRich) { m_isRich = isRich; }
#endif
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXUINT message, WXWPARAM wParam,
WXLPARAM lParam); WXLPARAM lParam);
@@ -149,7 +160,10 @@ public:
virtual long MSWGetDlgCode(); virtual long MSWGetDlgCode();
protected: protected:
#if wxUSE_RICHEDIT
bool m_isRich; // Are we using rich text edit to implement this? bool m_isRich; // Are we using rich text edit to implement this?
#endif
wxString m_fileName; wxString m_fileName;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()