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

correct access for virtuals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-07 07:22:55 +00:00
parent f4c4697652
commit bc48a5d75e
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/collpaneg.h
View File

@@ -21,7 +21,6 @@ class WXDLLEXPORT wxStaticLine;
// class name // class name
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGenericCollapsiblePane // wxGenericCollapsiblePane
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -64,7 +63,6 @@ public:
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxCollapsiblePaneNameStr); const wxString& name = wxCollapsiblePaneNameStr);
// public wxCollapsiblePane API // public wxCollapsiblePane API
virtual void Collapse(bool collapse = true); virtual void Collapse(bool collapse = true);
virtual void SetLabel(const wxString &label); virtual void SetLabel(const wxString &label);
@@ -76,6 +74,7 @@ public:
virtual wxString GetLabel() const virtual wxString GetLabel() const
{ return m_strLabel; } { return m_strLabel; }
virtual bool Layout();
// implementation only, don't use // implementation only, don't use
void OnStateChange(const wxSize& sizeNew); void OnStateChange(const wxSize& sizeNew);
@@ -83,7 +82,6 @@ public:
protected: protected:
// overridden methods // overridden methods
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
bool Layout();
wxString GetBtnLabel() const; wxString GetBtnLabel() const;
int GetBorder() const; int GetBorder() const;
@@ -107,6 +105,4 @@ private:
}; };
#endif // wxUSE_BUTTON && wxUSE_STATLINE #endif // wxUSE_BUTTON && wxUSE_STATLINE
#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_ #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_

13
include/wx/gtk/collpane.h
View File

@@ -51,25 +51,22 @@ public:
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxCollapsiblePaneNameStr); const wxString& name = wxCollapsiblePaneNameStr);
public: // public API
wxSize DoGetBestSize() const;
void Collapse(bool collapse = true); void Collapse(bool collapse = true);
bool IsCollapsed() const; bool IsCollapsed() const;
void SetLabel(const wxString &str); void SetLabel(const wxString &str);
void OnSize(wxSizeEvent&); protected:
virtual wxSize DoGetBestSize() const;
public: // used by GTK callbacks public: // used by GTK callbacks
bool m_bIgnoreNextChange; bool m_bIgnoreNextChange;
wxSize m_szCollapsed; wxSize m_szCollapsed;
private: private:
void OnSize(wxSizeEvent&);
DECLARE_DYNAMIC_CLASS(wxCollapsiblePane) DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // _WX_COLLAPSABLE_PANEL_H_GTK_
#endif
// _WX_COLLAPSABLE_PANEL_H_GTK_

7
include/wx/gtk/filepicker.h
View File

@@ -17,8 +17,6 @@
// that GTK+ < 2.4 // that GTK+ < 2.4
#include "wx/generic/filepickerg.h" #include "wx/generic/filepickerg.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxFileButton and wxDirButton shared code // wxFileButton and wxDirButton shared code
// (cannot be a base class since they need to derive from wxGenericFileButton // (cannot be a base class since they need to derive from wxGenericFileButton
@@ -49,6 +47,7 @@
/* invalid cast from `GtkFileChooserButton' to `GtkButton' */ \ /* invalid cast from `GtkFileChooserButton' to `GtkButton' */ \
/* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \ /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
/* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \
protected: \
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const \ virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const \
{ return NULL; } { return NULL; }
@@ -98,9 +97,6 @@ public: // overrides
// event handler for the click // event handler for the click
void OnDialogOK(wxCommandEvent &); void OnDialogOK(wxCommandEvent &);
public: // some overrides
// GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE
// so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE
// is not supported, wxFD_OVERWRITE_PROMPT isn't too... // is not supported, wxFD_OVERWRITE_PROMPT isn't too...
@@ -118,7 +114,6 @@ public: // some overrides
protected: protected:
wxDialog *m_dialog; wxDialog *m_dialog;
private:
DECLARE_DYNAMIC_CLASS(wxFileButton) DECLARE_DYNAMIC_CLASS(wxFileButton)
}; };