simpler implementation

[wxWidgets.git] / include / wx / generic / logg.h

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 1da53e5e6b7bb049a9b845f1c0a015609e101f02..36268ea5d32737523beb7f6c51a2b8e7702aaa4f 100644 (file)
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -12,10 +12,6 @@
 #ifndef   _WX_LOGG_H_
 #define   _WX_LOGG_H_
 
 #ifndef   _WX_LOGG_H_
 #define   _WX_LOGG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "logg.h"
-#endif
-

 #if wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #if wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -32,10 +28,11 @@ class WXDLLEXPORT wxLogTextCtrl : public wxLog
 public:
     wxLogTextCtrl(wxTextCtrl *pTextCtrl);
 
 public:
     wxLogTextCtrl(wxTextCtrl *pTextCtrl);
 

-private:
+protected:

     // implement sink function
     virtual void DoLogString(const wxChar *szString, time_t t);
 
     // implement sink function
     virtual void DoLogString(const wxChar *szString, time_t t);
 

+private:

     // the control we use
     wxTextCtrl *m_pTextCtrl;
 
     // the control we use
     wxTextCtrl *m_pTextCtrl;
 


@@ -45,7 +42,7 @@ private:
 #endif // wxUSE_TEXTCTRL
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_TEXTCTRL
 
 // ----------------------------------------------------------------------------

-// GUI log target, the default one for wxWindows programs
+// GUI log target, the default one for wxWidgets programs

 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOGGUI
 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOGGUI


@@ -88,16 +85,16 @@ protected:
 class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
 {
 public:
 class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
 {
 public:

-    wxLogWindow(wxFrame *pParent,         // the parent frame (can be NULL)
+    wxLogWindow(wxWindow *pParent,         // the parent frame (can be NULL)

                 const wxChar *szTitle,    // the title of the frame
                 const wxChar *szTitle,    // the title of the frame

-                bool bShow = TRUE,        // show window immediately?
-                bool bPassToOld = TRUE);  // pass messages to the old target?
+                bool bShow = true,        // show window immediately?
+                bool bPassToOld = true);  // pass messages to the old target?

 
 

-    ~wxLogWindow();
+    virtual ~wxLogWindow();

 
     // window operations
         // show/hide the log window
 
     // window operations
         // show/hide the log window

-    void Show(bool bShow = TRUE);
+    void Show(bool bShow = true);

         // retrieve the pointer to the frame
     wxFrame *GetFrame() const;
 
         // retrieve the pointer to the frame
     wxFrame *GetFrame() const;
 


@@ -107,7 +104,7 @@ public:
     virtual void OnFrameCreate(wxFrame *frame);
         // called if the user closes the window interactively, will not be
         // called if it is destroyed for another reason (such as when program
     virtual void OnFrameCreate(wxFrame *frame);
         // called if the user closes the window interactively, will not be
         // called if it is destroyed for another reason (such as when program

-        // exits) - return TRUE from here to allow the frame to close, FALSE
+        // exits) - return true from here to allow the frame to close, false

         // to prevent this from happening
     virtual bool OnFrameClose(wxFrame *frame);
         // called right before the log frame is going to be deleted: will
         // to prevent this from happening
     virtual bool OnFrameClose(wxFrame *frame);
         // called right before the log frame is going to be deleted: will