Added zillions of #if wxUSE_XXX

Removed cmndlgs usage of wxSizer and constraints Changed occurences of wxConv_xxx to wxConvXxxx and changed some wxConvLibc to wxConvCurrent Added Unicode tests to typetests (not finished) Compile fix for wxString in Unicode mode - we have to use the "experimental" printf then, I guess. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-06-14 23:04:05 +00:00
parent 9f50f9f1a1
commit dcf924a345
119 changed files with 845 additions and 410 deletions
--- a/include/wx/gtk1/accel.h
+++ b/include/wx/gtk1/accel.h
@@ -15,6 +15,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_ACCEL
+
 #include "wx/object.h"
 #include "wx/event.h"

@@ -103,3 +106,5 @@ class wxAcceleratorTable: public wxObject
 };

 #endif
+
+#endif
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_BMPBUTTON
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -91,4 +94,6 @@ public:
  wxBitmap     m_selected;   
 };

+#endif
+
 #endif // __BMPBUTTONH__
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_CHECKBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -73,4 +76,6 @@ public:
    GtkWidget *m_widgetLabel;
 };

+#endif
+
 #endif // __GTKCHECKBOXH__
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_CHECKLISTBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -53,4 +56,5 @@ public:
 };

 #endif
-        //__GTKCHECKLISTH__
+
+#endif   //__GTKCHECKLISTH__
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -18,6 +18,8 @@

 #include "wx/defs.h"

+#if wxUSE_COMBOBOX
+
 #include "wx/object.h"
 #include "wx/control.h"

@@ -123,6 +125,8 @@ public:
  DECLARE_EVENT_TABLE()
 };

+#endif
+
 #endif

  // __GTKCOMBOBOXH__
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -113,8 +113,12 @@ public:
    virtual void OnInternalIdle();

    wxMenuBar    *m_frameMenuBar;
+#if wxUSE_STATUSBAR
    wxStatusBar  *m_frameStatusBar;
+#endif
+#if wxUSE_TOOLBAR
    wxToolBar    *m_frameToolBar;
+#endif
    wxString      m_title;
    wxIcon        m_icon;
    int           m_miniEdge,m_miniTitle;
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_GAUGE
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -79,4 +82,6 @@ class wxGauge: public wxControl
   bool     m_useProgressBar;
 };

+#endif
+
 #endif // __GTKGAUGEH__
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_LISTBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -125,4 +128,6 @@ public:
 #endif // wxUSE_CHECKLISTBOX
 };

+#endif
+
 #endif // __GTKLISTBOXH__
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -119,22 +119,26 @@ class wxMDIChildFrame: public wxFrame

  virtual void Activate();
    
+#if wxUSE_STATUSBAR
    // no status bars
  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, 
    wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
  virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
  virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
  virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
+#endif

    // no size hints
  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
                               int WXUNUSED(maxW), int WXUNUSED(maxH),
                               int WXUNUSED(incW), int WXUNUSED(incH) ) {}
  
+#if wxUSE_TOOLBAR
    // no toolbar bars
  virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
    const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
  virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
+#endif
  
    // no icon
  void SetIcon( const wxIcon &icon ) { m_icon = icon; }
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -15,6 +15,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_MINIFRAME
+
 #include "wx/object.h"
 #include "wx/frame.h"

@@ -60,5 +63,7 @@ public:
    int    m_diffX,m_diffY;
 };

+#endif
+
 #endif
  //  __GTKMINIFRAMEH__
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_NOTEBOOK
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/control.h"
@@ -150,5 +153,7 @@ public:
  DECLARE_EVENT_TABLE()
 };

+#endif
+
 #endif
    // __GTKNOTEBOOKH__
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_RADIOBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -104,4 +107,6 @@ public:
  DECLARE_EVENT_TABLE()    
 };

+#endif
+
 #endif // __GTKRADIOBOXH__
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_RADIOBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -70,4 +73,6 @@ class wxRadioButton: public wxControl
    GtkWidget*  m_theOtherRadioButtton;
 };

+#endif
+
 #endif // __GTKRADIOBUTTONH__
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_SCROLLBAR
+
 #include "wx/object.h"
 #include "wx/control.h"

@@ -86,5 +89,7 @@ class wxScrollBar: public wxControl
    float           m_oldPos;
 };

+#endif
+
 #endif
    // __GTKSCROLLBARH__
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -15,6 +15,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_SLIDER
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -89,4 +92,6 @@ class wxSlider: public wxControl
    
 };

+#endif
+
 #endif // __GTKSLIDERH__
--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#ifdef wxUSE_SPINBTN
+
 #include "wx/object.h"
 #include "wx/control.h"

@@ -94,5 +97,7 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
  { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
  { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },

+#endif
+
 #endif
    // __GTKSPINBUTTH__
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_STATBMP
+
 #include "wx/object.h"
 #include "wx/control.h"
 #include "wx/bitmap.h"
@@ -57,4 +60,6 @@ class wxStaticBitmap: public wxControl
   wxBitmap   m_bitmap;
 };

+#endif
+
 #endif // __GTKSTATICBITMAPH__
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_STATBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -56,4 +59,6 @@ class wxStaticBox: public wxControl
    void ApplyWidgetStyle();
 };

+#endif
+
 #endif // __GTKSTATICBOXH__
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -16,6 +16,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_STATLINE
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -52,4 +55,6 @@ class wxStaticLine: public wxControl
    
 };

+#endif
+
 #endif // __GTKSTATICLINEH__
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -15,6 +15,9 @@
 #endif

 #include "wx/defs.h"
+
+#if wxUSE_TOOLBAR
+
 #include "wx/control.h"
 #include "wx/bitmap.h"
 #include "wx/tbarbase.h"
@@ -119,5 +122,7 @@ class wxToolBar: public wxControl
    bool          m_hasToolAlready;
 };

+#endif
+
 #endif
    // __TBARGTKH__