solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into webview-chromium

Browse source
This commit is contained in:
Vadim Zeitlin 2024-01-17 00:22:39 +01:00
commit ff59ef301b
342 changed files with 8214 additions and 4407 deletions
Download patch file Download diff file Expand all files Collapse all files

14
samples/docview/doc.h
View file

@ -164,6 +164,8 @@ class wxTextDocument : public wxDocument
{
public:
wxTextDocument() : wxDocument() { }
wxTextDocument(const wxTextDocument&) = delete;
wxTextDocument &operator=(const wxTextDocument&) = delete;
virtual bool OnCreate(const wxString& path, long flags) override;
@ -178,7 +180,6 @@ protected:
void OnTextChange(wxCommandEvent& event);
wxDECLARE_NO_COPY_CLASS(wxTextDocument);
wxDECLARE_ABSTRACT_CLASS(wxTextDocument);
};
@ -190,9 +191,11 @@ class TextEditDocument : public wxTextDocument
{
public:
TextEditDocument() : wxTextDocument() { }
TextEditDocument(const TextEditDocument&) = delete;
TextEditDocument &operator=(const TextEditDocument&) = delete;
virtual wxTextCtrl* GetTextCtrl() const override;
wxDECLARE_NO_COPY_CLASS(TextEditDocument);
wxDECLARE_DYNAMIC_CLASS(TextEditDocument);
};
@ -207,6 +210,8 @@ class ImageDocument : public wxDocument
{
public:
ImageDocument() : wxDocument() { }
ImageDocument(const ImageDocument&) = delete;
ImageDocument &operator=(const ImageDocument&) = delete;
virtual bool OnOpenDocument(const wxString& file) override;
@ -218,7 +223,6 @@ protected:
private:
wxImage m_image;
wxDECLARE_NO_COPY_CLASS(ImageDocument);
wxDECLARE_DYNAMIC_CLASS(ImageDocument);
};
@ -229,6 +233,8 @@ class ImageDetailsDocument : public wxDocument
{
public:
ImageDetailsDocument(ImageDocument *parent);
ImageDetailsDocument(const ImageDetailsDocument&) = delete;
ImageDetailsDocument &operator=(const ImageDetailsDocument&) = delete;
// accessors for ImageDetailsView
wxSize GetSize() const { return m_size; }
@ -242,8 +248,6 @@ private:
unsigned long m_numColours;
wxBitmapType m_type;
bool m_hasAlpha;
wxDECLARE_NO_COPY_CLASS(ImageDetailsDocument);
};
#endif // _WX_SAMPLES_DOCVIEW_DOC_H_

3
samples/docview/docview.h
View file

@ -35,6 +35,8 @@ public:
};
MyApp();
MyApp(const MyApp&) = delete;
MyApp& operator=(const MyApp&) = delete;
// override some wxApp virtual methods
virtual bool OnInit() override;
@ -90,7 +92,6 @@ private:
wxMenu *m_menuEdit;
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(MyApp);
};
wxDECLARE_APP(MyApp);

4
samples/docview/view.h
View file

@ -155,14 +155,14 @@ class ImageDetailsView : public wxView
{
public:
ImageDetailsView(ImageDetailsDocument *doc);
ImageDetailsView(const ImageDetailsView&) = delete;
ImageDetailsView& operator=(const ImageDetailsView&) = delete;
virtual void OnDraw(wxDC *dc) override;
virtual bool OnClose(bool deleteWindow) override;
private:
wxFrame *m_frame;
wxDECLARE_NO_COPY_CLASS(ImageDetailsView);
};
#endif // _WX_SAMPLES_DOCVIEW_VIEW_H_