Headers moved a bit.

  Minor docs updates.

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

diff --git a/docs/latex/wx/tconfig.tex b/docs/latex/wx/tconfig.tex
index 6baf8c59a5894a0ad07ce27404e3d2922fdb6eb5..0002c0c33dd299ccb47db96c5417abe113e4e36a 100644 (file)
--- a/docs/latex/wx/tconfig.tex
+++ b/docs/latex/wx/tconfig.tex
@@ -1,4 +1,4 @@
-\section{Config classes overview}\label{wxconfigoverview}
+\section{wxConfig classes overview}\label{wxconfigoverview}

 
 Classes: \helpref{wxConfig}{wxconfigbase}
 
 
 Classes: \helpref{wxConfig}{wxconfigbase}
 

diff --git a/docs/latex/wx/topics.tex b/docs/latex/wx/topics.tex
index 78ea66761fe17097fced7600102766dc40222259..cb3888132ed517d19ced784928634cd70a0747e6 100644 (file)
--- a/docs/latex/wx/topics.tex
+++ b/docs/latex/wx/topics.tex
@@ -8,13 +8,7 @@ This chapter contains a selection of topic overviews, first things first:
 \input tguide.tex
 \input hworld.tex
 \input tsamples.tex
 \input tguide.tex
 \input hworld.tex
 \input tsamples.tex

-
-Every application need one wxApp class, so we start here:
-

 \input tapp.tex
 \input tapp.tex

-
-Not everything in wxWindows is about GUI programming:
-

 \input truntime.tex
 \input tstring.tex
 \input tunicode.tex
 \input truntime.tex
 \input tstring.tex
 \input tunicode.tex


@@ -27,9 +21,6 @@ Not everything in wxWindows is about GUI programming:
 \input tconfig.tex
 \input texpr.tex
 \input fs.tex
 \input tconfig.tex
 \input texpr.tex
 \input fs.tex

-
-General overviews concerning windows and events:
-

 \input tevent.tex
 \input tstyles.tex
 \input tdelwin.tex
 \input tevent.tex
 \input tstyles.tex
 \input tdelwin.tex


@@ -38,16 +29,10 @@ General overviews concerning windows and events:
 \input tconstr.tex
 \input tresourc.tex
 \input tscroll.tex
 \input tconstr.tex
 \input tresourc.tex
 \input tscroll.tex

-
-Drawing and device context specific overviews:
-

 \input tbitmap.tex
 \input tdc.tex
 \input tfont.tex
 \input tfontenc.tex
 \input tbitmap.tex
 \input tdc.tex
 \input tfont.tex
 \input tfontenc.tex

-
-Special controls:
-

 \input tsplittr.tex
 \input ttreectl.tex
 \input tlistctl.tex
 \input tsplittr.tex
 \input ttreectl.tex
 \input tlistctl.tex


@@ -58,9 +43,6 @@ Special controls:
 \input ttoolbar.tex
 \input tgrid.tex
 \input ttips.tex
 \input ttoolbar.tex
 \input tgrid.tex
 \input ttips.tex

-
-Advanced topic overviews:
-

 \input tprint.tex
 \input tthreads.tex
 \input tdnd.tex
 \input tprint.tex
 \input tthreads.tex
 \input tdnd.tex

diff --git a/docs/latex/wx/tstream.tex b/docs/latex/wx/tstream.tex
index 9c407d2d04c6b1a6458e227555d3f661cda546ba..9bb13376abdfbcf6f282feb8beb7c934ad2df35d 100644 (file)
--- a/docs/latex/wx/tstream.tex
+++ b/docs/latex/wx/tstream.tex
@@ -1,4 +1,4 @@
-\section{Streams in wxWindows overview}\label{wxstreamoverview}
+\section{wxStreams overview}\label{wxstreamoverview}

 
 Classes: \helpref{wxStreamBase}{wxstreambase},
  \helpref{wxStreamBuffer}{wxstreambuffer}, \helpref{wxInputStream}{wxinputstream},
 
 Classes: \helpref{wxStreamBase}{wxstreambase},
  \helpref{wxStreamBuffer}{wxstreambuffer}, \helpref{wxInputStream}{wxinputstream},


@@ -62,13 +62,13 @@ code:
 
  // Ok, read some bytes ... nb_datas is expressed in bytes.
  in_stream.Read(data, nb_datas);
 
  // Ok, read some bytes ... nb_datas is expressed in bytes.
  in_stream.Read(data, nb_datas);

- if (in_stream.LastError() != wxStream_NOERROR) {
+ if (in_stream.LastError() != wxSTREAM_NOERROR) {

    // Oh oh, something bad happens.
    // For a complete list, look into the documentation at wxStreamBase.
  }
 
  // You can also inline all like this.
    // Oh oh, something bad happens.
    // For a complete list, look into the documentation at wxStreamBase.
  }
 
  // You can also inline all like this.

- if (in_stream.Read(data, nb_datas).LastError() != wxStream_NOERROR) {
+ if (in_stream.Read(data, nb_datas).LastError() != wxSTREAM_NOERROR) {

    // Do something.
  }
 
    // Do something.
  }
 

diff --git a/docs/latex/wx/tthreads.tex b/docs/latex/wx/tthreads.tex
index 531a04375b2b8932f071a7f7c076af717657c11b..c1ef2fdfff0e686f5a3daf8f16909ed9a4ffb8ee 100644 (file)
--- a/docs/latex/wx/tthreads.tex
+++ b/docs/latex/wx/tthreads.tex
@@ -34,10 +34,10 @@ more robust and will undoubtedly save you countless problems (example: under
 Win32 a thread can only access GDI objects such as pens, brushes, \&c created by
 itself and not by the other threads).
 
 Win32 a thread can only access GDI objects such as pens, brushes, \&c created by
 itself and not by the other threads).
 

-Final note: in the current release of wxWindows, there are no specific
-facilities for communicating between the threads. However, the usual 
-\helpref{ProcessEvent()}{wxevthandlerprocessevent} function may be used for
-thread communication too - but you should provide your own synchronisation
-mechanism if you use it (e.g. just use a critical section before sending a
-message) because there is no built-in synchronisation.
+For communication between threads, use 
+\helpref{wxEvtHandler::AddPendingEvent}{wxevthandleraddpendingprocessevent}
+or its short version \helpref{wxPostEvent}{wxpostevent}. These functions
+have thread safe implementation so that they can be used as they are for
+sending event from one thread to another.
+

 
 

diff --git a/include/wx/gtk/accel.h b/include/wx/gtk/accel.h
index a60eb15e981ee4d14e609dbea1ac9509655d9769..51efa101f7d126b6ff0647e210b5b7b254e627e3 100644 (file)
--- a/include/wx/gtk/accel.h
+++ b/include/wx/gtk/accel.h
@@ -96,8 +96,9 @@ public:
 
     bool Ok() const;
     
 
     bool Ok() const;
     

-//  implementation
-  
+    // implementation
+    // --------------
+ 

     int GetCommand( wxKeyEvent &event );
     
 private:
     int GetCommand( wxKeyEvent &event );
     
 private:

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 37c42b14c539eebf50c011f79edbe06ae89d6d64..2e8a50eb6735f3abccf8969ae4c13b76e4ce11ff 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -88,6 +88,7 @@ public:
     { return GetPalette(); };
 
     // implementation
     { return GetPalette(); };
 
     // implementation

+    // --------------

 
     void SetHeight( int height );
     void SetWidth( int width );
 
     void SetHeight( int height );
     void SetWidth( int width );


@@ -96,8 +97,6 @@ public:
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;

-
-    // no data :-)

     
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
     
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index dfcf70ce732b326e135f83cc42aac2e9f768cfe2..3f1c684d63b51a77fa2149e133175b79d4d443d6 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -76,8 +76,9 @@ public:
     
     virtual bool Enable(bool enable);
   
     
     virtual bool Enable(bool enable);
   

-// implementation
-
+    // implementation
+    // --------------
+  

     void HasFocus();
     void NotFocus();
     void StartSelect();
     void HasFocus();
     void NotFocus();
     void StartSelect();

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 051c16637cd4fe1c43566044ddf16ab44724acac..538720c63cb5fa553497fd09d9ea0ffe572c9419 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -59,7 +59,8 @@ public:
 
     static wxSize GetDefaultSize();
     
 
     static wxSize GetDefaultSize();
     

-  // implementation        
+    // implementation
+    // --------------

   
     void ApplyWidgetStyle();    
     
   
     void ApplyWidgetStyle();    
     

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 40afabfd83b1c7e5bb6cefb9365e3e1d410d466f..562f783397d99b21a7929aa2bba141f4e4fb59c7 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -66,6 +66,8 @@ public:
     bool Enable( bool enable );
 
     // implementation
     bool Enable( bool enable );
 
     // implementation

+    // --------------
+

     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 448c81b98831cc74bb64b61d760c81ba5aa294e3..279e80d7fb79a0beede6ef4e3367ca63611e06b7 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -55,15 +55,10 @@ public:
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 

-    // implementation
+protected:

     wxList m_clientList;    // contains the client data for the items
 
     wxList m_clientList;    // contains the client data for the items
 

-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

-
-protected:

     virtual int DoAppend(const wxString& item);
 
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual int DoAppend(const wxString& item);
 
     virtual void DoSetItemClientData( int n, void* clientData );


@@ -75,7 +70,7 @@ protected:
 
 private:
     // common part of Create() and DoAppend()
 
 private:
     // common part of Create() and DoAppend()

-    size_t AppendHelper(GtkWidget *menu, const wxString& item);
+    size_t GtkAppendHelper(GtkWidget *menu, const wxString& item);

 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index d274b6be95c24f6aeca538b9769ca67a85605170..fc353d46830f8d280b8af18c7e1d890d3285ba93 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -25,9 +25,7 @@
 
 class wxCursor: public wxObject
 {
 
 class wxCursor: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
-  public:
+public:

 
     wxCursor();
     wxCursor( int cursorId );
 
     wxCursor();
     wxCursor( int cursorId );


@@ -38,9 +36,12 @@ class wxCursor: public wxObject
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 

+    // implementation
+

     GdkCursor *GetCursor() const;
 
     GdkCursor *GetCursor() const;
 

-    // no data :-)
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 };
 
 #endif // __GTKCURSORH__
 };
 
 #endif // __GTKCURSORH__

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index c44beb9c53e1b9dd6b9811b937b934df147f840e..2ce4f8de26d51ae9da03f01e9da2b8eae05bf8be 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -40,8 +40,6 @@ class wxDC;
 
 class wxDC : public wxDCBase
 {
 
 class wxDC : public wxDCBase
 {

-    DECLARE_ABSTRACT_CLASS(wxDC)
-

 public:
     wxDC();
     ~wxDC() { }
 public:
     wxDC();
     ~wxDC() { }


@@ -151,6 +149,9 @@ public:
                  m_needComputeScaleY; // not yet used
 
     float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
                  m_needComputeScaleY; // not yet used
 
     float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.

+    
+private:
+    DECLARE_ABSTRACT_CLASS(wxDC)

 };
 
 #endif // __GTKDCH__
 };
 
 #endif // __GTKDCH__

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 19c9e2e09440ac55f6c518dd320c356febc4937e..a28585ffbd266795a114b5f8e9673953f53448d3 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -31,8 +31,6 @@ class wxClientDC;
 
 class wxWindowDC : public wxDC
 {
 
 class wxWindowDC : public wxDC
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );


@@ -121,6 +119,9 @@ public:
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -129,11 +130,12 @@ public:
 
 class wxPaintDC : public wxWindowDC
 {
 
 class wxPaintDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );
 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -142,12 +144,12 @@ public:
 
 class wxClientDC : public wxWindowDC
 {
 
 class wxClientDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
     wxClientDC();
     wxClientDC( wxWindow *win );
 public:
     wxClientDC();
     wxClientDC( wxWindow *win );

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)

 };
 
 };
 

-

 #endif // __GTKDCCLIENTH__
 #endif // __GTKDCCLIENTH__

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 2100ee7f75fb49e32b4faa38f6e5368e2dae0569..213b7e4eed79ece85084ecfba87514e2919aa75d 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -30,18 +30,18 @@ class wxMemoryDC;
 
 class wxMemoryDC : public wxWindowDC
 {
 
 class wxMemoryDC : public wxWindowDC
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-

 public:
 public:

-  wxMemoryDC();
-  wxMemoryDC( wxDC *dc ); // Create compatible DC
-  ~wxMemoryDC();
-  virtual void SelectObject( const wxBitmap& bitmap );
-  void DoGetSize( int *width, int *height ) const;
+    wxMemoryDC();
+    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    ~wxMemoryDC();
+    virtual void SelectObject( const wxBitmap& bitmap );
+    void DoGetSize( int *width, int *height ) const;

 
 

-  // implementation
+    // implementation
+    wxBitmap  m_selected;

 
 

-  wxBitmap  m_selected;
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index b53d12c8a8e38ffd9916590d932a9028f8c23a8b..64f1dfc6ac126ba47f679fc90dde193fe96bb3af 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -24,21 +24,22 @@ class wxScreenDC;
 
 class wxScreenDC: public wxPaintDC
 {
 
 class wxScreenDC: public wxPaintDC
 {

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
-

 public:
 public:

-  wxScreenDC();
-  ~wxScreenDC();
-
-  static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
-  static bool EndDrawingOnTop();
-
-  // implementation
-
-  static GdkWindow  *sm_overlayWindow;
-  static int         sm_overlayWindowX;
-  static int         sm_overlayWindowY;
+    wxScreenDC();
+    ~wxScreenDC();
+
+    static bool StartDrawingOnTop( wxWindow *window );
+    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
+    static bool EndDrawingOnTop();
+
+    // implementation
+    
+    static GdkWindow  *sm_overlayWindow;
+    static int         sm_overlayWindowX;
+    static int         sm_overlayWindowY;
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxScreenDC)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 5e66c1230696818327191fb0e17802c90b31490a..a90b7305f025080bbb13af798ed9d15027a72710 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -37,8 +37,6 @@ extern const wxChar *wxDialogNameStr;
 
 class wxDialog: public wxDialogBase
 {
 
 class wxDialog: public wxDialogBase
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,
 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,


@@ -106,6 +104,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 #endif // __GTKDIALOGH__
 };
 
 #endif // __GTKDIALOGH__

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 64485e5e4ebdebc2522564328d941bdc7178f182..200d5c3dde8b6d071dc8249d9e05ddee59738ec5 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -26,8 +26,6 @@ extern const wxChar *wxFileSelectorDefaultWildcardStr;
 
 class wxFileDialog: public wxDialog
 {
 
 class wxFileDialog: public wxDialog
 {

-DECLARE_DYNAMIC_CLASS(wxFileDialog)
-

 public:
     wxFileDialog() { }
 
 public:
     wxFileDialog() { }
 


@@ -56,7 +54,6 @@ public:
     int GetFilterIndex() const { return m_filterIndex ; }
     
 protected:    
     int GetFilterIndex() const { return m_filterIndex ; }
     
 protected:    

-    

     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;


@@ -65,6 +62,9 @@ protected:
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)

 };
 
 #define wxOPEN 1
 };
 
 #define wxOPEN 1

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 479d1d510de7a136d8f09a4cf9a5d0636c4c0021..ee018c01a17be90db5e34217160dba695477a002 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -41,9 +41,7 @@ extern const char* wxGaugeNameStr;
 
 class wxGauge: public wxControl
 {
 
 class wxGauge: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
+public:

     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
     inline wxGauge( wxWindow *parent, wxWindowID id, int range,
     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
     inline wxGauge( wxWindow *parent, wxWindowID id, int range,


@@ -73,13 +71,16 @@ class wxGauge: public wxControl
     // Are we a Win95/GTK progress bar, or a normal gauge?
     inline bool GetProgressBar() const { return m_useProgressBar; }
     
     // Are we a Win95/GTK progress bar, or a normal gauge?
     inline bool GetProgressBar() const { return m_useProgressBar; }
     

-  // implementation
+    // implementation
+    // -------------

     
     void ApplyWidgetStyle();
     
     void ApplyWidgetStyle();

-  
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+    int      m_rangeMax;
+    int      m_gaugePos;
+    bool     m_useProgressBar;
+   
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk/gdiobj.h b/include/wx/gtk/gdiobj.h
index ac8e8e94477b1a3364951d8b6d30cd28eff6dad6..23e4077cc7cda6a753615df9ced5f5daf39da07d 100644 (file)
--- a/include/wx/gtk/gdiobj.h
+++ b/include/wx/gtk/gdiobj.h
@@ -19,18 +19,18 @@
 
 class wxGDIObject : public wxObject
 {
 
 class wxGDIObject : public wxObject
 {

-DECLARE_DYNAMIC_CLASS(wxGDIObject)
-

 public:
 public:

-  inline wxGDIObject() { m_visible = FALSE; };
-  inline ~wxGDIObject() {};
+    inline wxGDIObject() { m_visible = FALSE; };
+    inline ~wxGDIObject() {}

 
 

-  virtual bool GetVisible() { return m_visible; }
-  virtual void SetVisible( bool visible ) { m_visible = visible; }
+    virtual bool GetVisible() { return m_visible; }
+    virtual void SetVisible( bool visible ) { m_visible = visible; }

 
 protected:
 
 protected:

-  bool m_visible; /* can a pointer to this object be safely taken?
-                   * - only if created within FindOrCreate... */
+    bool m_visible; /* can a pointer to this object be safely taken?
+                     * - only if created within FindOrCreate... */
+private:
+    DECLARE_DYNAMIC_CLASS(wxGDIObject)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index e306018665cc908955ee29cced755523aac85d31..9455d6c8ab0d495d8f0f6ce4e7f00a4951adbd46 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -31,25 +31,26 @@ class wxIcon;
 
 class wxIcon: public wxBitmap
 {
 
 class wxIcon: public wxBitmap
 {

-  DECLARE_DYNAMIC_CLASS(wxIcon)
-

 public:
 public:

-
-  wxIcon();
-  wxIcon( const wxIcon& icon);
-  wxIcon( const char **bits, int width=-1, int height=-1 );
-
-  // For compatibility with wxMSW where desired size is sometimes required to
-  // distinguish between multiple icons in a resource.
-  wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ):
-    wxBitmap(filename, type)
-  {
-  }
-  wxIcon( char **bits, int width=-1, int height=-1 );
-
-  wxIcon& operator = (const wxIcon& icon);
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+    wxIcon();
+    wxIcon( const wxIcon& icon);
+    wxIcon( const char **bits, int width=-1, int height=-1 );
+
+    // For compatibility with wxMSW where desired size is sometimes required to
+    // distinguish between multiple icons in a resource.
+    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, 
+            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
+        wxBitmap(filename, type)
+    {
+    }
+    wxIcon( char **bits, int width=-1, int height=-1 );
+
+    wxIcon& operator = (const wxIcon& icon);
+    inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
+    inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 
 };
 
 

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index cbe0cd1ae2ec4fd4f9f36e8190f09e20a83a4bd7..508a4e5ea01b8e5c1fa5e5dd9df83a72dd54c68c 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -35,10 +35,7 @@ typedef    char wxDash;
 
 class wxPen: public wxGDIObject
 {
 
 class wxPen: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)
-
-  public:
-
+public:

     wxPen();
     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxPen& pen );
     wxPen();
     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxPen& pen );


@@ -68,7 +65,8 @@ class wxPen: public wxGDIObject
 
     void Unshare();
 
 
     void Unshare();
 

-    // no data :-)
+private:    
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 #endif // __GTKPENH__
 };
 
 #endif // __GTKPENH__

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 75344cb221490c347d656577cb62c44b9b47bdf1..ddccb240da0015a38969e60482343b716cd29c63 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -40,10 +40,7 @@ extern const char *wxScrollBarNameStr;
 
 class wxScrollBar: public wxControl
 {
 
 class wxScrollBar: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-  public:
-  
+public:

     wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
     wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -69,7 +66,8 @@ class wxScrollBar: public wxControl
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 

-  // Backward compatibility
+    // Backward compatibility
+    // ----------------------

     
     int GetValue(void) const;
     void SetValue( int viewStart );
     
     int GetValue(void) const;
     void SetValue( int viewStart );


@@ -80,13 +78,17 @@ class wxScrollBar: public wxControl
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 

-  // implementation    
+    // implementation
+    // --------------

     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/accel.h b/include/wx/gtk1/accel.h
index a60eb15e981ee4d14e609dbea1ac9509655d9769..51efa101f7d126b6ff0647e210b5b7b254e627e3 100644 (file)
--- a/include/wx/gtk1/accel.h
+++ b/include/wx/gtk1/accel.h
@@ -96,8 +96,9 @@ public:
 
     bool Ok() const;
     
 
     bool Ok() const;
     

-//  implementation
-  
+    // implementation
+    // --------------
+ 

     int GetCommand( wxKeyEvent &event );
     
 private:
     int GetCommand( wxKeyEvent &event );
     
 private:

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 37c42b14c539eebf50c011f79edbe06ae89d6d64..2e8a50eb6735f3abccf8969ae4c13b76e4ce11ff 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -88,6 +88,7 @@ public:
     { return GetPalette(); };
 
     // implementation
     { return GetPalette(); };
 
     // implementation

+    // --------------

 
     void SetHeight( int height );
     void SetWidth( int width );
 
     void SetHeight( int height );
     void SetWidth( int width );


@@ -96,8 +97,6 @@ public:
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;

-
-    // no data :-)

     
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
     
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index dfcf70ce732b326e135f83cc42aac2e9f768cfe2..3f1c684d63b51a77fa2149e133175b79d4d443d6 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -76,8 +76,9 @@ public:
     
     virtual bool Enable(bool enable);
   
     
     virtual bool Enable(bool enable);
   

-// implementation
-
+    // implementation
+    // --------------
+  

     void HasFocus();
     void NotFocus();
     void StartSelect();
     void HasFocus();
     void NotFocus();
     void StartSelect();

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 051c16637cd4fe1c43566044ddf16ab44724acac..538720c63cb5fa553497fd09d9ea0ffe572c9419 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -59,7 +59,8 @@ public:
 
     static wxSize GetDefaultSize();
     
 
     static wxSize GetDefaultSize();
     

-  // implementation        
+    // implementation
+    // --------------

   
     void ApplyWidgetStyle();    
     
   
     void ApplyWidgetStyle();    
     

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 40afabfd83b1c7e5bb6cefb9365e3e1d410d466f..562f783397d99b21a7929aa2bba141f4e4fb59c7 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -66,6 +66,8 @@ public:
     bool Enable( bool enable );
 
     // implementation
     bool Enable( bool enable );
 
     // implementation

+    // --------------
+

     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 448c81b98831cc74bb64b61d760c81ba5aa294e3..279e80d7fb79a0beede6ef4e3367ca63611e06b7 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -55,15 +55,10 @@ public:
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 

-    // implementation
+protected:

     wxList m_clientList;    // contains the client data for the items
 
     wxList m_clientList;    // contains the client data for the items
 

-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

-
-protected:

     virtual int DoAppend(const wxString& item);
 
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual int DoAppend(const wxString& item);
 
     virtual void DoSetItemClientData( int n, void* clientData );


@@ -75,7 +70,7 @@ protected:
 
 private:
     // common part of Create() and DoAppend()
 
 private:
     // common part of Create() and DoAppend()

-    size_t AppendHelper(GtkWidget *menu, const wxString& item);
+    size_t GtkAppendHelper(GtkWidget *menu, const wxString& item);

 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index d274b6be95c24f6aeca538b9769ca67a85605170..fc353d46830f8d280b8af18c7e1d890d3285ba93 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -25,9 +25,7 @@
 
 class wxCursor: public wxObject
 {
 
 class wxCursor: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
-  public:
+public:

 
     wxCursor();
     wxCursor( int cursorId );
 
     wxCursor();
     wxCursor( int cursorId );


@@ -38,9 +36,12 @@ class wxCursor: public wxObject
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 

+    // implementation
+

     GdkCursor *GetCursor() const;
 
     GdkCursor *GetCursor() const;
 

-    // no data :-)
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 };
 
 #endif // __GTKCURSORH__
 };
 
 #endif // __GTKCURSORH__

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index c44beb9c53e1b9dd6b9811b937b934df147f840e..2ce4f8de26d51ae9da03f01e9da2b8eae05bf8be 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -40,8 +40,6 @@ class wxDC;
 
 class wxDC : public wxDCBase
 {
 
 class wxDC : public wxDCBase
 {

-    DECLARE_ABSTRACT_CLASS(wxDC)
-

 public:
     wxDC();
     ~wxDC() { }
 public:
     wxDC();
     ~wxDC() { }


@@ -151,6 +149,9 @@ public:
                  m_needComputeScaleY; // not yet used
 
     float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
                  m_needComputeScaleY; // not yet used
 
     float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.

+    
+private:
+    DECLARE_ABSTRACT_CLASS(wxDC)

 };
 
 #endif // __GTKDCH__
 };
 
 #endif // __GTKDCH__

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 19c9e2e09440ac55f6c518dd320c356febc4937e..a28585ffbd266795a114b5f8e9673953f53448d3 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -31,8 +31,6 @@ class wxClientDC;
 
 class wxWindowDC : public wxDC
 {
 
 class wxWindowDC : public wxDC
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );


@@ -121,6 +119,9 @@ public:
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -129,11 +130,12 @@ public:
 
 class wxPaintDC : public wxWindowDC
 {
 
 class wxPaintDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );
 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -142,12 +144,12 @@ public:
 
 class wxClientDC : public wxWindowDC
 {
 
 class wxClientDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
     wxClientDC();
     wxClientDC( wxWindow *win );
 public:
     wxClientDC();
     wxClientDC( wxWindow *win );

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)

 };
 
 };
 

-

 #endif // __GTKDCCLIENTH__
 #endif // __GTKDCCLIENTH__

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 2100ee7f75fb49e32b4faa38f6e5368e2dae0569..213b7e4eed79ece85084ecfba87514e2919aa75d 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -30,18 +30,18 @@ class wxMemoryDC;
 
 class wxMemoryDC : public wxWindowDC
 {
 
 class wxMemoryDC : public wxWindowDC
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-

 public:
 public:

-  wxMemoryDC();
-  wxMemoryDC( wxDC *dc ); // Create compatible DC
-  ~wxMemoryDC();
-  virtual void SelectObject( const wxBitmap& bitmap );
-  void DoGetSize( int *width, int *height ) const;
+    wxMemoryDC();
+    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    ~wxMemoryDC();
+    virtual void SelectObject( const wxBitmap& bitmap );
+    void DoGetSize( int *width, int *height ) const;

 
 

-  // implementation
+    // implementation
+    wxBitmap  m_selected;

 
 

-  wxBitmap  m_selected;
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h
index b53d12c8a8e38ffd9916590d932a9028f8c23a8b..64f1dfc6ac126ba47f679fc90dde193fe96bb3af 100644 (file)
--- a/include/wx/gtk1/dcscreen.h
+++ b/include/wx/gtk1/dcscreen.h
@@ -24,21 +24,22 @@ class wxScreenDC;
 
 class wxScreenDC: public wxPaintDC
 {
 
 class wxScreenDC: public wxPaintDC
 {

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
-

 public:
 public:

-  wxScreenDC();
-  ~wxScreenDC();
-
-  static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
-  static bool EndDrawingOnTop();
-
-  // implementation
-
-  static GdkWindow  *sm_overlayWindow;
-  static int         sm_overlayWindowX;
-  static int         sm_overlayWindowY;
+    wxScreenDC();
+    ~wxScreenDC();
+
+    static bool StartDrawingOnTop( wxWindow *window );
+    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
+    static bool EndDrawingOnTop();
+
+    // implementation
+    
+    static GdkWindow  *sm_overlayWindow;
+    static int         sm_overlayWindowX;
+    static int         sm_overlayWindowY;
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxScreenDC)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 5e66c1230696818327191fb0e17802c90b31490a..a90b7305f025080bbb13af798ed9d15027a72710 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -37,8 +37,6 @@ extern const wxChar *wxDialogNameStr;
 
 class wxDialog: public wxDialogBase
 {
 
 class wxDialog: public wxDialogBase
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,
 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,


@@ -106,6 +104,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 #endif // __GTKDIALOGH__
 };
 
 #endif // __GTKDIALOGH__

diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 64485e5e4ebdebc2522564328d941bdc7178f182..200d5c3dde8b6d071dc8249d9e05ddee59738ec5 100644 (file)
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -26,8 +26,6 @@ extern const wxChar *wxFileSelectorDefaultWildcardStr;
 
 class wxFileDialog: public wxDialog
 {
 
 class wxFileDialog: public wxDialog
 {

-DECLARE_DYNAMIC_CLASS(wxFileDialog)
-

 public:
     wxFileDialog() { }
 
 public:
     wxFileDialog() { }
 


@@ -56,7 +54,6 @@ public:
     int GetFilterIndex() const { return m_filterIndex ; }
     
 protected:    
     int GetFilterIndex() const { return m_filterIndex ; }
     
 protected:    

-    

     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;


@@ -65,6 +62,9 @@ protected:
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)

 };
 
 #define wxOPEN 1
 };
 
 #define wxOPEN 1

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 479d1d510de7a136d8f09a4cf9a5d0636c4c0021..ee018c01a17be90db5e34217160dba695477a002 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -41,9 +41,7 @@ extern const char* wxGaugeNameStr;
 
 class wxGauge: public wxControl
 {
 
 class wxGauge: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
+public:

     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
     inline wxGauge( wxWindow *parent, wxWindowID id, int range,
     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
     inline wxGauge( wxWindow *parent, wxWindowID id, int range,


@@ -73,13 +71,16 @@ class wxGauge: public wxControl
     // Are we a Win95/GTK progress bar, or a normal gauge?
     inline bool GetProgressBar() const { return m_useProgressBar; }
     
     // Are we a Win95/GTK progress bar, or a normal gauge?
     inline bool GetProgressBar() const { return m_useProgressBar; }
     

-  // implementation
+    // implementation
+    // -------------

     
     void ApplyWidgetStyle();
     
     void ApplyWidgetStyle();

-  
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+    int      m_rangeMax;
+    int      m_gaugePos;
+    bool     m_useProgressBar;
+   
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/gdiobj.h b/include/wx/gtk1/gdiobj.h
index ac8e8e94477b1a3364951d8b6d30cd28eff6dad6..23e4077cc7cda6a753615df9ced5f5daf39da07d 100644 (file)
--- a/include/wx/gtk1/gdiobj.h
+++ b/include/wx/gtk1/gdiobj.h
@@ -19,18 +19,18 @@
 
 class wxGDIObject : public wxObject
 {
 
 class wxGDIObject : public wxObject
 {

-DECLARE_DYNAMIC_CLASS(wxGDIObject)
-

 public:
 public:

-  inline wxGDIObject() { m_visible = FALSE; };
-  inline ~wxGDIObject() {};
+    inline wxGDIObject() { m_visible = FALSE; };
+    inline ~wxGDIObject() {}

 
 

-  virtual bool GetVisible() { return m_visible; }
-  virtual void SetVisible( bool visible ) { m_visible = visible; }
+    virtual bool GetVisible() { return m_visible; }
+    virtual void SetVisible( bool visible ) { m_visible = visible; }

 
 protected:
 
 protected:

-  bool m_visible; /* can a pointer to this object be safely taken?
-                   * - only if created within FindOrCreate... */
+    bool m_visible; /* can a pointer to this object be safely taken?
+                     * - only if created within FindOrCreate... */
+private:
+    DECLARE_DYNAMIC_CLASS(wxGDIObject)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index e306018665cc908955ee29cced755523aac85d31..9455d6c8ab0d495d8f0f6ce4e7f00a4951adbd46 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -31,25 +31,26 @@ class wxIcon;
 
 class wxIcon: public wxBitmap
 {
 
 class wxIcon: public wxBitmap
 {

-  DECLARE_DYNAMIC_CLASS(wxIcon)
-

 public:
 public:

-
-  wxIcon();
-  wxIcon( const wxIcon& icon);
-  wxIcon( const char **bits, int width=-1, int height=-1 );
-
-  // For compatibility with wxMSW where desired size is sometimes required to
-  // distinguish between multiple icons in a resource.
-  wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ):
-    wxBitmap(filename, type)
-  {
-  }
-  wxIcon( char **bits, int width=-1, int height=-1 );
-
-  wxIcon& operator = (const wxIcon& icon);
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+    wxIcon();
+    wxIcon( const wxIcon& icon);
+    wxIcon( const char **bits, int width=-1, int height=-1 );
+
+    // For compatibility with wxMSW where desired size is sometimes required to
+    // distinguish between multiple icons in a resource.
+    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, 
+            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
+        wxBitmap(filename, type)
+    {
+    }
+    wxIcon( char **bits, int width=-1, int height=-1 );
+
+    wxIcon& operator = (const wxIcon& icon);
+    inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
+    inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 
 };
 
 

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index cbe0cd1ae2ec4fd4f9f36e8190f09e20a83a4bd7..508a4e5ea01b8e5c1fa5e5dd9df83a72dd54c68c 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -35,10 +35,7 @@ typedef    char wxDash;
 
 class wxPen: public wxGDIObject
 {
 
 class wxPen: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)
-
-  public:
-
+public:

     wxPen();
     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxPen& pen );
     wxPen();
     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxPen& pen );


@@ -68,7 +65,8 @@ class wxPen: public wxGDIObject
 
     void Unshare();
 
 
     void Unshare();
 

-    // no data :-)
+private:    
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 #endif // __GTKPENH__
 };
 
 #endif // __GTKPENH__

diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index 75344cb221490c347d656577cb62c44b9b47bdf1..ddccb240da0015a38969e60482343b716cd29c63 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -40,10 +40,7 @@ extern const char *wxScrollBarNameStr;
 
 class wxScrollBar: public wxControl
 {
 
 class wxScrollBar: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-  public:
-  
+public:

     wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
     wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -69,7 +66,8 @@ class wxScrollBar: public wxControl
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 

-  // Backward compatibility
+    // Backward compatibility
+    // ----------------------

     
     int GetValue(void) const;
     void SetValue( int viewStart );
     
     int GetValue(void) const;
     void SetValue( int viewStart );


@@ -80,13 +78,17 @@ class wxScrollBar: public wxControl
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 

-  // implementation    
+    // implementation
+    // --------------

     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 7860cd1097e5d5650a7a8c37c64c46480254964b..22bfd7c36b639625323c5b85d3e7decb768858c5 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -45,6 +45,10 @@ class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxMenuItemBase : public wxObject
 {
 public:
 class WXDLLEXPORT wxMenuItemBase : public wxObject
 {
 public:

+    // some compilers need a default constructor here, do not use
+    wxMenuItemBase() 
+        { wxFAIL_MSG( wxT("illegal call") ); }
+

     // creation
     static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,
                            int id = wxID_SEPARATOR,
     // creation
     static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,
                            int id = wxID_SEPARATOR,

diff --git a/samples/thread/test.cpp b/samples/thread/test.cpp
index 08aa48a00a45d841885b87d26e05ea419cabb985..1d8d3423bee504b8028877a04642b6dd76766be1 100644 (file)
--- a/samples/thread/test.cpp
+++ b/samples/thread/test.cpp
@@ -131,7 +131,7 @@ void MyThread::WriteText(const wxString& text)
 
     wxMutexGuiEnter();
 
 
     wxMutexGuiEnter();
 

-    msg << wxTime().FormatTime() << ": " << text;
+    msg << text;

 
     m_frame->WriteText(msg);
 
 
     m_frame->WriteText(msg);
 

diff --git a/src/common/image.cpp b/src/common/image.cpp
index f4102cea5be55db0134b459a13cad2cdc9254b55..be1fcda4f573a3d614ae68411971cd99ddd308a9 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1277,12 +1277,12 @@ wxImage::wxImage( const wxBitmap &bitmap )
 
 #ifdef __WXGTK__
 
 
 #ifdef __WXGTK__
 

-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>

 
 #if (GTK_MINOR_VERSION > 0)
 
 #if (GTK_MINOR_VERSION > 0)

-#include "gdk/gdkrgb.h"
+#include <gdk/gdkrgb.h>

 #endif
 
 wxBitmap wxImage::ConvertToBitmap() const
 #endif
 
 wxBitmap wxImage::ConvertToBitmap() const

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 5d08196d7b2e1ebd346c18f3211b963cd805ee51..26a9ea36e6d6e023559aee039d0f3761e21ebaa2 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -32,11 +32,11 @@
 #include "wx/thread.h"
 #endif
 
 #include "wx/thread.h"
 #endif
 

-#include "unistd.h"
+#include <unistd.h>

 
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 33b1a1f286d2783345252629c3a2dc7b12c2a70b..975f4ab6ed711ffbd9e70ce82059386b7821566c 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -16,9 +16,9 @@
 #include "wx/filefn.h"
 #include "wx/image.h"
 
 #include "wx/filefn.h"
 #include "wx/image.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 81f655e070f7d3fe4520e39d610106bf321e89a2..dc359f07c7144148812a157cac98599882d2540c 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -15,8 +15,8 @@
 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index b86a7615bc1aa2b29dee37e9f791ed8aacbabe49..01f3665a7abd7d22f0824f039cb5b978b5a6256d 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/brush.h"
 
 
 #include "wx/brush.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-----------------------------------------------------------------------------
 // wxBrush
 
 //-----------------------------------------------------------------------------
 // wxBrush

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index c12fd527781db2871df1252c35c63023205527b3..eeb2e134d03b5d19726b0221e8ac7916e716b6ef 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -13,8 +13,8 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index c6cf5f5d7f6bd9c91f2745a6dd43052dd5beecc4..3e3b959f4f5f3e8468a18aa453bb7f0e48cee548 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 5d08196d7b2e1ebd346c18f3211b963cd805ee51..26a9ea36e6d6e023559aee039d0f3761e21ebaa2 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -32,11 +32,11 @@
 #include "wx/thread.h"
 #endif
 
 #include "wx/thread.h"
 #endif
 

-#include "unistd.h"
+#include <unistd.h>

 
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 33b1a1f286d2783345252629c3a2dc7b12c2a70b..975f4ab6ed711ffbd9e70ce82059386b7821566c 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -16,9 +16,9 @@
 #include "wx/filefn.h"
 #include "wx/image.h"
 
 #include "wx/filefn.h"
 #include "wx/image.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 81f655e070f7d3fe4520e39d610106bf321e89a2..dc359f07c7144148812a157cac98599882d2540c 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -15,8 +15,8 @@
 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index b86a7615bc1aa2b29dee37e9f791ed8aacbabe49..01f3665a7abd7d22f0824f039cb5b978b5a6256d 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/brush.h"
 
 
 #include "wx/brush.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-----------------------------------------------------------------------------
 // wxBrush
 
 //-----------------------------------------------------------------------------
 // wxBrush

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index c12fd527781db2871df1252c35c63023205527b3..eeb2e134d03b5d19726b0221e8ac7916e716b6ef 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -13,8 +13,8 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index c6cf5f5d7f6bd9c91f2745a6dd43052dd5beecc4..3e3b959f4f5f3e8468a18aa453bb7f0e48cee548 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system