[ 1494561 ] wxComboCtrl vertical size fix.

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

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 16418df233846102dac9a6cb300cd02958cc48d6..b9580939ad64845696ae288314997ed9948dc6fc 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(NO_GCC_PRAGMA)
-    #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;
 


@@ -88,7 +85,7 @@ 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
                 bool bShow = true,        // show window immediately?
                 bool bPassToOld = true);  // pass messages to the old target?
                 const wxChar *szTitle,    // the title of the frame
                 bool bShow = true,        // show window immediately?
                 bool bPassToOld = true);  // pass messages to the old target?