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

compilation fixes and minor improvements

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-07-24 20:28:36 +00:00
parent 9260761613
commit 4ba80ec7ff
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/helphtml.h
View File

@@ -126,12 +126,13 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
{ {
// does nothing by default // does nothing by default
} }
/// Obtains the latest settings used by the help frame. /// Obtains the latest settings used by the help frame and the help
virtual void GetFrameParameters(wxSize *size = NULL, /// frame.
virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
wxPoint *pos = NULL, wxPoint *pos = NULL,
bool *newFrameEachTime = NULL) bool *newFrameEachTime = NULL)
{ {
// does nothing by default return NULL;// does nothing by default
} }
protected: protected:

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

@@ -51,9 +51,9 @@ DECLARE_CLASS(wxHelpControllerHtml)
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
bool newFrameEachTime = FALSE); bool newFrameEachTime = FALSE);
/// Obtains the latest settings used by the help frame. /// Obtains the latest settings used by the help frame.
virtual void GetFrameParameters(wxSize *size = NULL, virtual wxFrame * GetFrameParameters(wxSize *size = NULL,
wxPoint *pos = NULL, wxPoint *pos = NULL,
bool *newFrameEachTime = NULL); bool *newFrameEachTime = NULL);
private: private:

9
src/generic/helpwxht.cpp
View File

@@ -59,9 +59,9 @@ public:
wxString doc; wxString doc;
if (s == NULL) return wxEmptyString; if (s == NULL) return wxEmptyString;
src = new char[s -> StreamSize()+1]; src = new char[s -> GetSize()+1];
src[s -> StreamSize()] = 0; src[s -> GetSize()] = 0;
s -> Read(src, s -> StreamSize()); s -> Read(src, s -> GetSize());
doc = src; doc = src;
delete [] src; delete [] src;
return doc; return doc;
@@ -293,7 +293,7 @@ wxHelpControllerHtml::SetFrameParameters(const wxString &title,
m_NewFrameEachTime = newFrame; m_NewFrameEachTime = newFrame;
} }
void wxFrame *
wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL, wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
wxPoint *pos = NULL, wxPoint *pos = NULL,
bool *newframe = NULL) bool *newframe = NULL)
@@ -301,6 +301,7 @@ wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
if(size) *size = m_FrameSize; if(size) *size = m_FrameSize;
if(pos) *pos = m_FramePosition; if(pos) *pos = m_FramePosition;
if(newframe) *newframe = m_NewFrameEachTime; if(newframe) *newframe = m_NewFrameEachTime;
return m_Frame;
} }
#endif // wxUSE_HTML #endif // wxUSE_HTML

7
src/generic/progdlgg.cpp
View File

@@ -65,8 +65,11 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_maximum = maximum; m_maximum = maximum;
m_elapsed = m_estimated = m_remaining = NULL; m_elapsed = m_estimated = m_remaining = NULL;
if ((style & (wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME)) != 0) m_time = new wxTime; if ((style & (wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME |
else m_time = NULL; wxPD_REMAINING_TIME)) != 0)
m_time = new wxTime;
else
m_time = NULL;
wxFrame::Create(m_parent, -1, title, wxDefaultPosition, wxFrame::Create(m_parent, -1, title, wxDefaultPosition,
wxDefaultSize, wxDEFAULT_DIALOG_STYLE); wxDefaultSize, wxDEFAULT_DIALOG_STYLE);

1
src/generic/treectrl.cpp
View File

@@ -161,6 +161,7 @@ private:
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// wxTreeEvent // wxTreeEvent
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
: wxNotifyEvent( commandType, id ) : wxNotifyEvent( commandType, id )