Added validation support
Fixed a few minor things in wxGrid Fixed bug in SetClippingregion Disabled SetDefault again Fixed bug in AddChild, SetSize et al. Add PROCESS_ENTER and wxEVT_TEXT_CHANGE Renamed OnOk -> OnOK Added a few compatibilty functions Added code to make iinterception of events possible and work git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,6 +60,9 @@ class wxBitmapButton: public wxControl
|
||||
void SetDefault(void);
|
||||
void SetLabel( const wxString &label );
|
||||
wxString GetLabel(void) const;
|
||||
virtual void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); }
|
||||
virtual void SetBitmapLabel( const wxBitmap& bitmap );
|
||||
wxBitmap& GetBitmapLabel(void) const { return (wxBitmap&) m_bitmap; }
|
||||
|
||||
public:
|
||||
|
||||
|
@@ -63,7 +63,7 @@ class wxDialog: public wxWindow
|
||||
bool OnClose(void);
|
||||
void OnApply( wxCommandEvent &event );
|
||||
void OnCancel( wxCommandEvent &event );
|
||||
void OnOk( wxCommandEvent &event );
|
||||
void OnOK( wxCommandEvent &event );
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
bool Destroy(void);
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
@@ -75,15 +75,19 @@ class wxDialog: public wxWindow
|
||||
virtual void EndModal(int retCode);
|
||||
virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
|
||||
virtual void InitDialog(void);
|
||||
virtual void Centre( int direction = wxHORIZONTAL );
|
||||
|
||||
private:
|
||||
|
||||
friend wxWindow;
|
||||
friend wxDC;
|
||||
friend wxRadioBox;
|
||||
|
||||
bool m_modalShowing;
|
||||
wxString m_title;
|
||||
|
||||
virtual void ImplementSetPosition();
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
};
|
||||
|
@@ -61,6 +61,7 @@ public:
|
||||
|
||||
virtual bool Show( bool show );
|
||||
virtual void Enable( bool enable );
|
||||
virtual void Centre( int direction = wxHORIZONTAL );
|
||||
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
virtual void SetClientSize( int const width, int const height );
|
||||
@@ -90,6 +91,7 @@ public:
|
||||
virtual void SetIcon( const wxIcon &icon );
|
||||
void Iconize( bool WXUNUSED(iconize)) { }
|
||||
bool IsIconized(void) const { return FALSE; }
|
||||
bool Iconized(void) const { return FALSE; }
|
||||
|
||||
void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
|
||||
void OnSize( wxSizeEvent &event );
|
||||
@@ -107,6 +109,7 @@ private:
|
||||
// update frame's menus (called from OnIdle)
|
||||
void DoMenuUpdates();
|
||||
void DoMenuUpdates(wxMenu* menu);
|
||||
virtual void ImplementSetPosition();
|
||||
|
||||
GtkWidget *m_mainWindow;
|
||||
wxMenuBar *m_frameMenuBar;
|
||||
|
@@ -48,7 +48,7 @@ class wxTextCtrl: public wxControl, public streambuf
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxTextCtrl);
|
||||
|
||||
public:
|
||||
public:
|
||||
wxTextCtrl();
|
||||
wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
|
||||
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
|
||||
@@ -102,11 +102,12 @@ public:
|
||||
wxTextCtrl& operator<<(const char c);
|
||||
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
private:
|
||||
bool m_modified;
|
||||
|
||||
GtkWidget *m_text;
|
||||
private:
|
||||
|
||||
bool m_modified;
|
||||
GtkWidget *m_text;
|
||||
};
|
||||
|
||||
#endif // __GTKTEXTCTRLH__
|
||||
|
@@ -103,7 +103,8 @@ public:
|
||||
virtual bool Show( bool show );
|
||||
virtual void Enable( bool enable );
|
||||
virtual void MakeModal( bool modal );
|
||||
virtual bool IsEnabled() const { return m_isEnabled; };
|
||||
virtual bool IsEnabled() const { return m_isEnabled; }
|
||||
inline bool Enabled(void) const { return IsEnabled(); }
|
||||
virtual void SetFocus();
|
||||
virtual bool OnClose();
|
||||
|
||||
@@ -191,8 +192,9 @@ public:
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget );
|
||||
virtual wxDropTarget *GetDropTarget() const;
|
||||
|
||||
private:
|
||||
//private:
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
public:
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
|
Reference in New Issue
Block a user