compilation fixes for non default wxUSE_XXX values (patch 662781)

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 3320f3c855b58844284fcb2bffd70b9321caa0a3..6ce050c80f264104a8e5a3e32872f9a768fd399e 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1075,6 +1075,26 @@
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 

+#if wxUSE_DOC_VIEW_ARCHITECTURE
+#   if !wxUSE_MENUS
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "DocView requires wxUSE_MENUS"
+#        else
+#            undef wxUSE_MENUS
+#            define wxUSE_MENUS 1
+#        endif
+#   endif
+
+#   if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"
+#        else
+#            undef wxUSE_STREAMS
+#            define wxUSE_STREAMS 1
+#        endif
+#   endif
+#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
+

 #if wxUSE_PRINTING_ARCHITECTURE
 #   if !wxUSE_COMBOBOX
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_PRINTING_ARCHITECTURE
 #   if !wxUSE_COMBOBOX
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -1084,18 +1104,27 @@
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif

+
+#   if !wxUSE_DOC_VIEW_ARCHITECTURE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Print architecture requires wxUSE_DOC_VIEW_ARCHITECTURE"
+#       else
+#           undef wxUSE_DOC_VIEW_ARCHITECTURE
+#           define wxUSE_DOC_VIEW_ARCHITECTURE 1
+#       endif
+#   endif

 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 

-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#   if !wxUSE_MENUS
+#if wxUSE_MDI_ARCHITECTURE
+#   if !wxUSE_DOC_VIEW_ARCHITECTURE

 #        ifdef wxABORT_ON_CONFIG_ERROR
 #        ifdef wxABORT_ON_CONFIG_ERROR

-#            error "DocView requires wxUSE_MENUS"
+#            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"

 #        else
 #        else

-#            undef wxUSE_MENUS
-#            define wxUSE_MENUS 1
+#            undef wxUSE_DOC_VIEW_ARCHITECTURE
+#            define wxUSE_DOC_VIEW_ARCHITECTURE 1

 #        endif
 #   endif
 #        endif
 #   endif

-#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
+#endif /* wxUSE_MDI_ARCHITECTURE */

 
 #if !wxUSE_FILEDLG
 #   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
 
 #if !wxUSE_FILEDLG
 #   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 9212802c6d19e14fd10d90d4b1cd7600b7b1dc8f..75f3dc348ad6d9c5b76424d68befe261c7c4ffe1 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -602,7 +602,7 @@ public:
             float *descent = NULL, float *externalLeading = NULL,
             wxFont *theFont = NULL, bool use16bit = FALSE) const ;
     void GetSize(float* width, float* height) const { int w, h; GetSize(& w, & h); *width = w; *height = h; }
             float *descent = NULL, float *externalLeading = NULL,
             wxFont *theFont = NULL, bool use16bit = FALSE) const ;
     void GetSize(float* width, float* height) const { int w, h; GetSize(& w, & h); *width = w; *height = h; }

-    void GetSizeMM(float *width, float *height) const { long w, h; GetSizeMM(& w, & h); *width = (float) w; *height = (float) h; }
+    void GetSizeMM(float *width, float *height) const { int w, h; GetSizeMM(& w, & h); *width = (float) w; *height = (float) h; }

 
 #endif // WXWIN_COMPATIBILITY
 
 
 #endif // WXWIN_COMPATIBILITY
 

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index be6f89a6ebabb0bdabf963700aa1effbc3b24c15..cd9b1d9b742bb0f267c30a504c770bc80c09b122 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -18,7 +18,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_MDI_ARCHITECTURE

 
 #include "wx/docview.h"
 #include "wx/mdi.h"
 
 #include "wx/docview.h"
 #include "wx/mdi.h"

diff --git a/include/wx/docview.h b/include/wx/docview.h
index fab912f35f95888f198165b602eb03167b599c66..57cf016b972b97f343ab0d03a2484ffd44fec774 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -17,6 +17,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+

 #include "wx/list.h"
 #include "wx/cmndata.h"
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/cmndata.h"
 #include "wx/string.h"


@@ -586,6 +589,8 @@ bool WXDLLEXPORT wxTransferStreamToFile(wxSTD istream& stream, const wxString& f
 // converts from/to a stream to/from a temporary file.
 bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
 bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
 // converts from/to a stream to/from a temporary file.
 bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
 bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);

-#endif
+#endif // wxUSE_STD_IOSTREAM
+
+#endif // wxUSE_DOC_VIEW_ARCHITECTURE

 
 #endif // _WX_DOCH__
 
 #endif // _WX_DOCH__

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index e0336e13681d2b384b3e72653a4ca1270d7af381..64737702c677b3dffe5c9d8af8ab29cd9347b30d 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -71,6 +71,17 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
 
     virtual void DoSetVirtualSize(int x, int y);
 

+#if WXWIN_COMPATIBILITY   
+     virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const;   
+     virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const;
+     // Need to do this otherwise the compiler gets confuced 
+     // between float and int calls to this function.
+     void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+        { wxScrollHelper::CalcScrolledPosition(x, y, xx, yy); }
+     wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
+        { return wxScrollHelper::CalcScrolledPosition(pt); }
+#endif // WXWIN_COMPATIBILITY
+

 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 80016c0a096a0fac7c6499b2093948d84fe0fdb4..8a7e9323c890600c133b5a516928bd8eb752078c 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -91,8 +91,10 @@ public :
     inline bool operator==(const wxPoint2DInt& pt) const;
     inline bool operator!=(const wxPoint2DInt& pt) const;
 
     inline bool operator==(const wxPoint2DInt& pt) const;
     inline bool operator!=(const wxPoint2DInt& pt) const;
 

+#if wxUSE_STREAMS

     void WriteTo( wxDataOutputStream &stream ) const;
     void ReadFrom( wxDataInputStream &stream );
     void WriteTo( wxDataOutputStream &stream ) const;
     void ReadFrom( wxDataInputStream &stream );

+#endif // wxUSE_STREAMS

 
     wxInt32 m_x;
     wxInt32 m_y;
 
     wxInt32 m_x;
     wxInt32 m_y;


@@ -738,8 +740,10 @@ public:
        bool operator == (const wxRect2DInt& rect) const;
        bool operator != (const wxRect2DInt& rect) const;
 
        bool operator == (const wxRect2DInt& rect) const;
        bool operator != (const wxRect2DInt& rect) const;
 

+#if wxUSE_STREAMS

        void WriteTo( wxDataOutputStream &stream ) const;
        void ReadFrom( wxDataInputStream &stream );
        void WriteTo( wxDataOutputStream &stream ) const;
        void ReadFrom( wxDataInputStream &stream );

+#endif // wxUSE_STREAMS

 
        wxInt32 m_x;
        wxInt32 m_y;
 
        wxInt32 m_x;
        wxInt32 m_y;

diff --git a/include/wx/log.h b/include/wx/log.h
index b3c90abbdfb9151ae67f2cd55837b8a1f92b4c66..a08916b1cb206d36669d81b1230ed6dcaad5f815 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -537,6 +537,20 @@ inline void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \
                                      va_list argptr) {}             \
 inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) {}
 
                                      va_list argptr) {}             \
 inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) {}
 

+// Empty Class to fake wxLogNull
+class WXDLLEXPORT wxLogNull
+{
+public:
+    wxLogNull() {}
+};
+
+// Dummy macros to replace some functions.
+#define wxSysErrorCode() (unsigned long)0
+#define wxSysErrorMsg( X ) (const wxChar*)NULL
+
+// Fake symbolic trace masks... for those that are used frequently
+#define wxTRACE_OleCalls wxT("") // OLE interface calls
+

 #endif // wxUSE_LOG/!wxUSE_LOG
 
 // a generic function for all levels (level is passes as parameter)
 #endif // wxUSE_LOG/!wxUSE_LOG
 
 // a generic function for all levels (level is passes as parameter)


@@ -626,4 +640,3 @@ void WXDLLEXPORT wxSafeShowMessage(const wxString& title, const wxString& text);
 
 #endif  // _WX_LOG_H_
 
 
 #endif  // _WX_LOG_H_
 

-// vi:sts=4:sw=4:et

diff --git a/include/wx/mac/dialog.h b/include/wx/mac/dialog.h
index fc58b6f03a1cb3782ea1e8479e50f242b10c8777..333d5b9dc24b433ffecaca7cf8936df98f1cf365 100644 (file)
--- a/include/wx/mac/dialog.h
+++ b/include/wx/mac/dialog.h
@@ -87,7 +87,6 @@ public:
     // --------------
 
     // event handlers
     // --------------
 
     // event handlers

-//    bool OnClose();

     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 9cc136d524b7f9944fb2760ebecae2a0d35d37a3..c8d36d63faaa5b41ae00ca39b713135eb07a7135 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -22,7 +22,7 @@ WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)

-        
+

 public:
     wxDialog();
 
 public:
     wxDialog();
 


@@ -49,49 +49,48 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
     {
         Create(parent, id, title, pos, size, style, name);
     }

-    
+

     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& title, // bool modal = FALSE, // TODO make this a window style?
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE,
         const wxString& name = wxDialogNameStr);
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& title, // bool modal = FALSE, // TODO make this a window style?
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE,
         const wxString& name = wxDialogNameStr);

-    
+

     ~wxDialog();
     ~wxDialog();

-    
+

     virtual bool Destroy();
 
     virtual bool Show(bool show = TRUE);
 
     void SetTitle(const wxString& title);
     virtual bool Destroy();
 
     virtual bool Show(bool show = TRUE);
 
     void SetTitle(const wxString& title);

-    
+

     void SetModal(bool flag);
     void SetModal(bool flag);

-    
+

     virtual bool IsModal() const
     { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
     virtual bool IsModal() const
     { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }

-    
+

     virtual int ShowModal();
     virtual void EndModal(int retCode);
     virtual int ShowModal();
     virtual void EndModal(int retCode);

-    
+

     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     inline WXWidget GetTopWidget() const { return m_mainWidget; }
     inline WXWidget GetClientWidget() const { return m_mainWidget; }
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     inline WXWidget GetTopWidget() const { return m_mainWidget; }
     inline WXWidget GetClientWidget() const { return m_mainWidget; }

-    
+

     // Standard buttons
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
     // Standard buttons
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);

-    
+

     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);

-    
-    //  bool OnClose();
+

     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);

-    
+

 private:
     virtual bool DoCreate( wxWindow* parent, wxWindowID id,
                            const wxString& title,
 private:
     virtual bool DoCreate( wxWindow* parent, wxWindowID id,
                            const wxString& title,


@@ -108,9 +107,9 @@ protected:
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);

-    
+

     virtual void DoSetClientSize(int width, int height);
     virtual void DoSetClientSize(int width, int height);

-    
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index fa4233e801535a96a3dc5826fa5ecee3a64cc4f0..8551941d1c89d36f9b06b0c8fc4ecc2bde1b80f9 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -48,7 +48,7 @@ public:
                 const wxString& name = wxButtonNameStr);
 
 #if WXWIN_COMPATIBILITY
                 const wxString& name = wxButtonNameStr);
 
 #if WXWIN_COMPATIBILITY

-    wxBitmap *GetBitmap() const { return (wxBitmap *) & m_bmp; }
+    wxBitmap *GetBitmap() const { return (wxBitmap *) &GetBitmapLabel(); }

 #endif
 
     // Implementation
 #endif
 
     // Implementation

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index e47ddcde3cf5d49216ebe43d6409800a77e91a7c..ccda8bc1afda4d0615945f947f9c092e17dc0997 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -79,7 +79,6 @@ public:
     virtual bool Show(bool show = TRUE);
 
     // event handlers
     virtual bool Show(bool show = TRUE);
 
     // event handlers

-    bool OnClose();

     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 0198cd9bfa7c8780332c4f0a40b6ccd9e0109eff..bd96a0497ac0e9d8f5f75660554774a2c43d2e9e 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -110,7 +110,6 @@ public:
     //
     // Event handlers
     //
     //
     // Event handlers
     //

-    bool OnClose(void);

     void OnCharHook(wxKeyEvent& rEvent);
     void OnCloseWindow(wxCloseEvent& rEvent);
 
     void OnCharHook(wxKeyEvent& rEvent);
     void OnCloseWindow(wxCloseEvent& rEvent);
 

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 8090d33ea5fb443b2d8c58d9714eb5a4823601d6..6fe47801ffc58fae33ad9ff6896005cfa43dc89d 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -475,6 +475,7 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
 
 static void LINKAGEMODE SetTraceMasks()
 {
 
 static void LINKAGEMODE SetTraceMasks()
 {

+#if wxUSE_LOG

     wxString mask;
     if ( wxGetEnv(wxT("WXTRACE"), &mask) )
     {
     wxString mask;
     if ( wxGetEnv(wxT("WXTRACE"), &mask) )
     {


@@ -482,6 +483,7 @@ static void LINKAGEMODE SetTraceMasks()
         while ( tkn.HasMoreTokens() )
             wxLog::AddTraceMask(tkn.GetNextToken());
     }
         while ( tkn.HasMoreTokens() )
             wxLog::AddTraceMask(tkn.GetNextToken());
     }

+#endif // wxUSE_LOG

 }
 
 // wxASSERT() helper
 }
 
 // wxASSERT() helper

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index fa690612713e30900c4fcf109184e832595f640a..2c7f79268a0ff19ca1b29c159bc05b0f429b2123 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_MDI_ARCHITECTURE

 
 #include "wx/docmdi.h"
 
 
 #include "wx/docmdi.h"
 

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index cd5435952e5383e0ddeec3f17501199633aca70c..8d34c443b3615e56cdaa9eeac410713ab0b68698 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -894,7 +894,7 @@ wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {
  wxSocketBase *sock = GetPort();
  if (!sock)
 {
  wxSocketBase *sock = GetPort();
  if (!sock)

-  return FALSE;
+  return NULL;

  wxList *file_list = new wxList;
  wxString line;
  // NLST : List of Filenames (including Directory's !)
  wxList *file_list = new wxList;
  wxString line;
  // NLST : List of Filenames (including Directory's !)

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index e10221ee8ecf24ef2d26fe3eba01ef14e6c089b6..6c171e73a544bc7eaf16f6a17c3b564c840e256e 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -152,6 +152,7 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
 
 // wxPoint2D
 
 
 // wxPoint2D
 

+#if wxUSE_STREAMS

 void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );
 void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );


@@ -163,6 +164,7 @@ void wxPoint2DInt::ReadFrom( wxDataInputStream &stream )
     m_x = stream.Read32();
     m_y = stream.Read32();
 }
     m_x = stream.Read32();
     m_y = stream.Read32();
 }

+#endif // wxUSE_STREAMS

 
 wxDouble wxPoint2DInt::GetVectorAngle() const
 {
 
 wxDouble wxPoint2DInt::GetVectorAngle() const
 {


@@ -338,6 +340,7 @@ wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r )
     return *this;
 }
 
     return *this;
 }
 

+#if wxUSE_STREAMS

 void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );
 void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );


@@ -353,5 +356,6 @@ void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
     m_width = stream.Read32();
     m_height = stream.Read32();
 }
     m_width = stream.Read32();
     m_height = stream.Read32();
 }

+#endif // wxUSE_STREAMS

 
 #endif // wxUSE_GEOMETRY
 
 #endif // wxUSE_GEOMETRY

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 010c34084a44ab17b3f740c53d358cc8e0e372a9..1ba36f910c643e169b8a71280eae52f995889100 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_IMAGE && wxUSE_STREAMS
+#if wxUSE_IMAGE

 
 #include "wx/imagbmp.h"
 #include "wx/bitmap.h"
 
 #include "wx/imagbmp.h"
 #include "wx/bitmap.h"


@@ -52,6 +52,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
 

+#if wxUSE_STREAMS
+

 #ifndef BI_RGB
 #define BI_RGB       0
 #define BI_RLE8      1
 #ifndef BI_RGB
 #define BI_RGB       0
 #define BI_RLE8      1


@@ -964,6 +966,8 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
     return hdr[0] == 'B' && hdr[1] == 'M';
 }
 
     return hdr[0] == 'B' && hdr[1] == 'M';
 }
 

+#endif // wxUSE_STREAMS
+

 
 #if wxUSE_ICO_CUR
 //-----------------------------------------------------------------------------
 
 #if wxUSE_ICO_CUR
 //-----------------------------------------------------------------------------


@@ -972,6 +976,8 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
 

+#if wxUSE_STREAMS
+

 struct ICONDIRENTRY
 {
     wxUint8         bWidth;               // Width of the image
 struct ICONDIRENTRY
 {
     wxUint8         bWidth;               // Width of the image


@@ -1288,6 +1294,7 @@ bool wxICOHandler::DoCanRead(wxInputStream& stream)
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';
 }
 
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';
 }
 

+#endif // wxUSE_STREAMS

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -1296,6 +1303,8 @@ bool wxICOHandler::DoCanRead(wxInputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 

+#if wxUSE_STREAMS
+

 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
     stream.SeekI(0);
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
     stream.SeekI(0);


@@ -1307,12 +1316,16 @@ bool wxCURHandler::DoCanRead(wxInputStream& stream)
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';
 }
 
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';
 }
 

+#endif // wxUSE_STREAMS
+

 //-----------------------------------------------------------------------------
 // wxANIHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
 
 //-----------------------------------------------------------------------------
 // wxANIHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
 

+#if wxUSE_STREAMS
+

 bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int index)
 {
 bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int index)
 {


@@ -1470,6 +1483,8 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

+#endif // wxUSE_STREAMS
+

 #endif // wxUSE_ICO_CUR
 
 #endif // wxUSE_ICO_CUR
 

-#endif // wxUSE_IMAGE && wxUSE_STREAMS
+#endif // wxUSE_IMAGE

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 64a4d246b0efa5058f7aec2cfe7ed9524243ad88..975252e0e1446ec3a12d563ee1c7fc24cc6c5ffd 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -23,7 +23,7 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_IMAGE && wxUSE_STREAMS && wxUSE_PCX
+#if wxUSE_IMAGE && wxUSE_PCX

 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"
 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"


@@ -35,6 +35,14 @@
 #include "wx/list.h"
 #include "wx/object.h"
 
 #include "wx/list.h"
 #include "wx/object.h"
 

+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+

 //-----------------------------------------------------------------------------
 // RLE encoding and decoding
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // RLE encoding and decoding
 //-----------------------------------------------------------------------------


@@ -429,8 +437,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
-

 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     int error;
 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     int error;


@@ -494,5 +500,7 @@ bool wxPCXHandler::DoCanRead( wxInputStream& stream )
     return c == 10;
 }
 
     return c == 10;
 }
 

-#endif // wxUSE_STREAMS && wxUSE_PCX
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IMAGE && wxUSE_PCX

 
 

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 45dd9c46cae2666347ead63a522522a116725d6e..653c4effc8e3dee4473b554cd2965641b4c7e5e4 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -54,7 +54,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 

-#if wxUSE_LIBPNG
+#if wxUSE_STREAMS

 
 #ifndef PNGLINKAGEMODE
     #ifdef __WATCOMC__
 
 #ifndef PNGLINKAGEMODE
     #ifdef __WATCOMC__

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 16c952d297020d7d399ab2730a928017e081e345..741bc364723fdc2940dc672f5b1543413b730f7c 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -47,6 +47,8 @@ extern "C"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 

+#if wxUSE_STREAMS
+

 extern "C"
 {
 
 extern "C"
 {
 


@@ -377,8 +379,7 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
            (hdr[0] == 'M' && hdr[1] == 'M');
 }
 
            (hdr[0] == 'M' && hdr[1] == 'M');
 }
 

+#endif  // wxUSE_STREAMS

 
 

-#endif
-   // wxUSE_LIBTIFF
-
+#endif  // wxUSE_LIBTIFF

 
 

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index ee22bc1b48f1437902896fb6c76fffac7f93899c..f4348de56e9af75174f5fa559a2c9b760157e316 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1069,6 +1069,7 @@ wxString wxGetCurrentDir()
 // wxDoExecuteWithCapture() helper: reads an entire stream into one array
 //
 // returns TRUE if ok, FALSE if error
 // wxDoExecuteWithCapture() helper: reads an entire stream into one array
 //
 // returns TRUE if ok, FALSE if error

+#if wxUSE_STREAMS

 static bool ReadAll(wxInputStream *is, wxArrayString& output)
 {
     wxCHECK_MSG( is, FALSE, _T("NULL stream in wxExecute()?") );
 static bool ReadAll(wxInputStream *is, wxArrayString& output)
 {
     wxCHECK_MSG( is, FALSE, _T("NULL stream in wxExecute()?") );


@@ -1097,6 +1098,7 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output)
 
     return cont;
 }
 
     return cont;
 }

+#endif // wxUSE_STREAMS

 
 // this is a private function because it hasn't a clean interface: the first
 // array is passed by reference, the second by pointer - instead we have 2
 
 // this is a private function because it hasn't a clean interface: the first
 // array is passed by reference, the second by pointer - instead we have 2

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index f894eed0732ab7ed90421b6b7895f1a8d40302c8..aa805541dab4eed34953bd7f7e5afa5a6d20c4d7 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1177,7 +1177,9 @@ bool wxWindowBase::TransferDataToWindow()
         if ( validator && !validator->TransferToWindow() )
         {
             wxLogWarning(_("Could not transfer data to window"));
         if ( validator && !validator->TransferToWindow() )
         {
             wxLogWarning(_("Could not transfer data to window"));

+#if wxUSE_LOG

             wxLog::FlushActive();
             wxLog::FlushActive();

+#endif // wxUSE_LOG

 
             return FALSE;
         }
 
             return FALSE;
         }

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 54e5bfa109f637e86a58de8e7e8957bad8722047..f3b82f938c6f3a91357ba50230c594ecc689cf27 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -1146,7 +1146,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename)
 
 #endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
 
 
 #endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
 

-#if wxUSE_TEXTCTRL
+#if wxUSE_LOG && wxUSE_GUI && wxUSE_TEXTCTRL

 
 // ----------------------------------------------------------------------------
 // wxLogTextCtrl implementation
 
 // ----------------------------------------------------------------------------
 // wxLogTextCtrl implementation


@@ -1173,6 +1173,6 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     m_pTextCtrl->AppendText(msg);
 }
 
     m_pTextCtrl->AppendText(msg);
 }
 

-#endif // wxUSE_TEXTCTRL
+#endif // wxUSE_LOG && wxUSE_GUI && wxUSE_TEXTCTRL

 
 // vi:sts=4:sw=4:et
 
 // vi:sts=4:sw=4:et

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 2361aa10f438b1028fadc5043a4351c0b221eac8..7e26d1504f424f726f03109db06b6977e5d91f01 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -701,8 +701,10 @@ int wxEntry(WXHINSTANCE hInstance,
         // we can't simply double-click on the error message and get to that
         // line in the source. So VC++ at least, let's have a sensible default.
 #ifdef __VISUALC__
         // we can't simply double-click on the error message and get to that
         // line in the source. So VC++ at least, let's have a sensible default.
 #ifdef __VISUALC__

+#if wxUSE_LOG

         wxLog::SetTimestamp(NULL);
         wxLog::SetTimestamp(NULL);

-#endif
+#endif // wxUSE_LOG
+#endif // __VISUALC__

 
         // init the app
         int retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;
 
         // init the app
         int retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;


@@ -1300,9 +1302,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // MT-FIXME
     static bool s_inYield = FALSE;
 
     // MT-FIXME
     static bool s_inYield = FALSE;
 

+#if wxUSE_LOG

     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();

+#endif // wxUSE_LOG

 
     if ( s_inYield )
     {
 
     if ( s_inYield )
     {


@@ -1333,8 +1337,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // if there are pending events, we must process them.
     ProcessPendingEvents();
 
     // if there are pending events, we must process them.
     ProcessPendingEvents();
 

+#if wxUSE_LOG

     // let the logs be flashed again
     wxLog::Resume();
     // let the logs be flashed again
     wxLog::Resume();

+#endif // wxUSE_LOG

 
     s_inYield = FALSE;
 
 
     s_inYield = FALSE;
 

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index fceabb32c48615173efa4348288c1b0f4cefd9db..872e8056a58a08d20e9a74a1c8f5d6397dce49bd 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -389,11 +389,11 @@ bool wxBitmap::Create(int w, int h, int d)
         }
 
         SetHBITMAP((WXHBITMAP)hbmp);
         }
 
         SetHBITMAP((WXHBITMAP)hbmp);

-    }

 
 #if WXWIN_COMPATIBILITY_2
 
 #if WXWIN_COMPATIBILITY_2

-    GetBitmapData()->m_ok = hbmp != 0;
+        GetBitmapData()->m_ok = hbmp != 0;

 #endif // WXWIN_COMPATIBILITY_2
 #endif // WXWIN_COMPATIBILITY_2

+    }

 
     return Ok();
 }
 
     return Ok();
 }

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 79b1b5e14f4fd5191e3f841f4f34c5b135976803..8a05efa95c76f6b68e7d0206eff9e4e6c8ea2ba5 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -2035,25 +2035,6 @@ void wxDC::SetLogicalScale(double x, double y)
     m_logicalScaleY = y;
 }
 
     m_logicalScaleY = y;
 }
 

-#if WXWIN_COMPATIBILITY
-void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
-                         float *descent, float *externalLeading,
-                         wxFont *theFont, bool use16bit) const
-{
-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
-
-    wxCoord x1, y1, descent1, externalLeading1;
-    GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
-    *x = x1; *y = y1;
-    if (descent)
-        *descent = descent1;
-    if (externalLeading)
-        *externalLeading = externalLeading1;
-}
-#endif
-

 #if wxUSE_DC_CACHEING
 
 /*
 #if wxUSE_DC_CACHEING
 
 /*

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index b9765d4ab057b4b5d57e6cc9a4866dc478eda3ea..a0398ffae2307e1db30af419f8e898d3c3ec1201 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2298,8 +2298,10 @@ LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM w
 {
     // trace all messages - useful for the debugging
 #ifdef __WXDEBUG__
 {
     // trace all messages - useful for the debugging
 #ifdef __WXDEBUG__

+#if wxUSE_LOG

     wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"),
                wxGetMessageName(message), (long) wParam, lParam);
     wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"),
                wxGetMessageName(message), (long) wParam, lParam);

+#endif // wxUSE_LOG

 #endif // __WXDEBUG__
 
     wxWindowMSW *wnd = wxFindWinFromHandle((WXHWND) hWnd);
 #endif // __WXDEBUG__
 
     wxWindowMSW *wnd = wxFindWinFromHandle((WXHWND) hWnd);


@@ -2892,8 +2894,10 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
     if ( !processed )
     {
 #ifdef __WXDEBUG__
     if ( !processed )
     {
 #ifdef __WXDEBUG__

+#if wxUSE_LOG

         wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
                    wxGetMessageName(message));
         wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
                    wxGetMessageName(message));

+#endif // wxUSE_LOG

 #endif // __WXDEBUG__
         rc.result = MSWDefWindowProc(message, wParam, lParam);
     }
 #endif // __WXDEBUG__
         rc.result = MSWDefWindowProc(message, wParam, lParam);
     }

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 4a5cef4e16b2c65678b45c1097ce112b31732895..9715d7754c2a960649f572d0faa61814257a6703 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -2887,18 +2887,5 @@ void wxDC::SetLogicalScale(
     m_logicalScaleY = dY;
 }; // end of wxDC::SetLogicalScale
 
     m_logicalScaleY = dY;
 }; // end of wxDC::SetLogicalScale
 

-#if WXWIN_COMPATIBILITY
-void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
-                         float *descent, float *externalLeading,
-                         wxFont *theFont, bool use16bit) const
-{
-    wxCoord x1, y1, descent1, externalLeading1;
-    GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
-    *x = x1; *y = y1;
-    if (descent)
-        *descent = descent1;
-    if (externalLeading)
-        *externalLeading = externalLeading1;
-}
-#endif
+