compilation fixes and minor improvements

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index 647d54549c56599259fe34781a70549f3478b938..07da22b3c883be34559d0b04ff169de6a15f44ee 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -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.
-   virtual void GetFrameParameters(wxSize *size = NULL,
+   /// Obtains the latest settings used by the help frame and the help 
+   /// frame.
+   virtual wxFrame *GetFrameParameters(wxSize *size = NULL,

                                    wxPoint *pos = NULL,
                                    bool *newFrameEachTime = NULL)
       {
                                    wxPoint *pos = NULL,
                                    bool *newFrameEachTime = NULL)
       {

-         // does nothing by default
+         return NULL;// does nothing by default

       }
 
  protected:
       }
 
  protected:

diff --git a/include/wx/generic/helpwxht.h b/include/wx/generic/helpwxht.h
index 18c765afae0e1d1f71df24031b28b8a49e7b114c..9f1f8f9fcad2c7593985ff1550dfffc6c6dceb1d 100644 (file)
--- a/include/wx/generic/helpwxht.h
+++ b/include/wx/generic/helpwxht.h
@@ -51,9 +51,9 @@ DECLARE_CLASS(wxHelpControllerHtml)
                                    const wxPoint &pos = wxDefaultPosition,
                                    bool newFrameEachTime = FALSE);
    /// Obtains the latest settings used by the help frame.
                                    const wxPoint &pos = wxDefaultPosition,
                                    bool newFrameEachTime = FALSE);
    /// Obtains the latest settings used by the help frame.

-   virtual void GetFrameParameters(wxSize *size = NULL,
-                                   wxPoint *pos = NULL,
-                                   bool *newFrameEachTime = NULL);
+   virtual wxFrame * GetFrameParameters(wxSize *size = NULL,
+                                        wxPoint *pos = NULL,
+                                        bool *newFrameEachTime = NULL);

    
    
 private:
    
    
 private:

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 2dc02e2b10e47a591687736c955380aec2a2ef37..66e90901e2311788d672bb6c0ad20480b5c24f3e 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -59,9 +59,9 @@ public:
          wxString doc;
 
          if (s == NULL) return wxEmptyString;
          wxString doc;
 
          if (s == NULL) return wxEmptyString;

-         src = new char[s -> StreamSize()+1];
-         src[s -> StreamSize()] = 0;
-         s -> Read(src, s -> StreamSize());
+         src = new char[s -> GetSize()+1];
+         src[s -> GetSize()] = 0;
+         s -> Read(src, s -> GetSize());

          doc = src;
          delete [] src;
          return doc;
          doc = src;
          delete [] src;
          return doc;


@@ -293,7 +293,7 @@ wxHelpControllerHtml::SetFrameParameters(const wxString &title,
    m_NewFrameEachTime = newFrame;
 }
 
    m_NewFrameEachTime = newFrame;
 }
 

-void
+wxFrame *

 wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
                                          wxPoint *pos = NULL,
                                          bool *newframe = NULL)
 wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
                                          wxPoint *pos = NULL,
                                          bool *newframe = NULL)


@@ -301,6 +301,7 @@ wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;
    if(newframe) *newframe = m_NewFrameEachTime;
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;
    if(newframe) *newframe = m_NewFrameEachTime;

+   return m_Frame;

 }
 
 #endif // wxUSE_HTML
 }
 
 #endif // wxUSE_HTML

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 4f7d4b3802d7e45916a8aae88bb3a7c925c6184a..fb07876a737a5868fea352993ac056197faf1c98 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -65,8 +65,11 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
    m_maximum = maximum;
 
    m_elapsed = m_estimated = m_remaining = NULL;
    m_maximum = maximum;
 
    m_elapsed = m_estimated = m_remaining = NULL;

-   if ((style & (wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME)) != 0) m_time = new wxTime;
-   else m_time = NULL;
+   if ((style & (wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME |
+                 wxPD_REMAINING_TIME)) != 0)
+      m_time = new wxTime;
+   else
+      m_time = NULL;

 
    wxFrame::Create(m_parent, -1, title, wxDefaultPosition,
                    wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
 
    wxFrame::Create(m_parent, -1, title, wxDefaultPosition,
                    wxDefaultSize, wxDEFAULT_DIALOG_STYLE);

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 492bc1b7d47d8f11ccec8c01e3d1a108b5000b3d..b7bd7f569d4a56897ad93dfee9e434faaccbc4d7 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -161,6 +161,7 @@ private:
 // -----------------------------------------------------------------------------
 // wxTreeEvent
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxTreeEvent
 // -----------------------------------------------------------------------------

+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)

 
 wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
            : wxNotifyEvent( commandType, id )
 
 wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
            : wxNotifyEvent( commandType, id )