interface fixes; removed many functions which were deprecated in past and have alread...

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

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index d9febd92537b4b45a3a7fcd716ede3b5bb178c94..53a0c72ac5754f29d60946390aaca4686d58d603 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -857,11 +857,6 @@ public:
     */
     virtual bool ClearColumns();
 
     */
     virtual bool ClearColumns();
 

-    /**
-        Unselects all rows.
-    */
-    void ClearSelection();
-

     /**
         Collapses the item.
     */
     /**
         Collapses the item.
     */


@@ -1597,14 +1592,14 @@ public:
     /**
         Returns @true if the column is reorderable.
     */
     /**
         Returns @true if the column is reorderable.
     */

-    bool GetReorderable();
+    virtual bool IsReorderable() const;

 
     /**
         Returns @true if the column is sortable.
 
         @see SetSortable()
     */
 
     /**
         Returns @true if the column is sortable.
 
         @see SetSortable()
     */

-    bool GetSortable();
+    virtual bool IsSortable() const;

 
     /**
         Returns the width of the column.
 
     /**
         Returns the width of the column.

diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h
index 457d36fb3ba693d7f7ea08e4c7df6477e6b3aa66..8599707e8b670993927e897e62b1dc9eaeeea7dd 100644 (file)
--- a/interface/wx/datetime.h
+++ b/interface/wx/datetime.h
@@ -1797,7 +1797,7 @@ public:
         date set to 0. Hours are not restricted to 0-24 range, neither are
         minutes, seconds or milliseconds.
     */
         date set to 0. Hours are not restricted to 0-24 range, neither are
         minutes, seconds or milliseconds.
     */

-    wxTimeSpan(long hours, long min, long sec, long msec);
+    wxTimeSpan(long hours, long min = 0, wxLongLong sec = 0, wxLongLong msec = 0);

 
     /**
         Returns the absolute value of the timespan: does not modify the object.
 
     /**
         Returns the absolute value of the timespan: does not modify the object.

diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 4f19e1be0630e0c767473fabdbd6a29b9356c11c..55d29cb45cb3781e5a1bcf292983da06da884f71 100644 (file)
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -136,13 +136,6 @@ public:
     */
     void Clear();
 
     */
     void Clear();
 

-    /**
-        Performs all necessary computations for given platform and context type
-        after each change of scale and origin parameters. Usually called
-        automatically internally after such changes.
-    */
-    virtual void ComputeScaleAndOrigin();
-

     /**
         Displays a cross hair using the current pen. This is a vertical and
         horizontal line the height and width of the window, centred on the
     /**
         Displays a cross hair using the current pen. This is a vertical and
         horizontal line the height and width of the window, centred on the


@@ -759,7 +752,7 @@ public:
     /**
         Returns @true if the DC is ok to use.
     */
     /**
         Returns @true if the DC is ok to use.
     */

-    bool Ok();
+    bool IsOk() const;

 
     /**
         Converts logical X coordinate to device coordinate, using the current
 
     /**
         Converts logical X coordinate to device coordinate, using the current

diff --git a/interface/wx/dcprint.h b/interface/wx/dcprint.h
index 0a9d7f7ab886202f09ac19ec07049e7a7766d71b..2c28140f8442099ad99f6acb941ab9c6ee6211d3 100644 (file)
--- a/interface/wx/dcprint.h
+++ b/interface/wx/dcprint.h
@@ -30,20 +30,6 @@ public:
         you pass a pointer instead.
     */
     wxPrinterDC(const wxPrintData& printData);
         you pass a pointer instead.
     */
     wxPrinterDC(const wxPrintData& printData);

-    /**
-        Constructor. With empty strings for the first three arguments, the
-        default printer dialog is displayed. @a device indicates the type of
-        printer and @a output is an optional file for printing to. The
-        @a driver parameter is currently unused.  Use the wxDC::Ok() member to
-        test whether the constructor was successful in creating a usable device
-        context.
-
-        @deprecated This constructor is deprecated and retained only for
-                    backward compatibility.
-    */
-    wxPrinterDC(const wxString& driver, const wxString& device,
-                const wxString& output, bool interactive = true,
-                int orientation = wxPORTRAIT);

 
     /**
         Return the rectangle in device coordinates that corresponds to the full
 
     /**
         Return the rectangle in device coordinates that corresponds to the full


@@ -54,6 +40,6 @@ public:
         negative values, while the bottom right coordinates will be somewhat
         larger than the values returned by wxDC::GetSize().
     */
         negative values, while the bottom right coordinates will be somewhat
         larger than the values returned by wxDC::GetSize().
     */

-    wxRect wxPrinterDC::GetPaperRect();
+    wxRect GetPaperRect() const;

 };
 
 };
 

diff --git a/interface/wx/dcps.h b/interface/wx/dcps.h
index 2aeaa41eeeaf77a8f53d25affb16d96c3144c38f..0f5ab592290d89ffc47a78accc8191fbd5b7ef72 100644 (file)
--- a/interface/wx/dcps.h
+++ b/interface/wx/dcps.h
@@ -24,29 +24,12 @@ public:
     */
     wxPostScriptDC(const wxPrintData& printData);
 
     */
     wxPostScriptDC(const wxPrintData& printData);
 

-    /**
-        Constructor. @a output is an optional file for printing to, and if
-        @a interactive is @true a dialog box will be displayed for adjusting
-        various parameters. @a parent is the parent of the printer dialog box.
-
-        Use the wxDC::Ok() member to test whether the constructor was
-        successful in creating a usable device context.
-
-        See wxPrintData for various functions to set and get PostScript
-        printing settings.
-
-        @deprecated This constructor is deprecated.
-    */
-    wxPostScriptDC(const wxString& output,
-                   bool interactive,
-                   wxWindow* parent);
-

     /**
         Return resolution used in PostScript output.
 
         @see SetResolution()
     */
     /**
         Return resolution used in PostScript output.
 
         @see SetResolution()
     */

-    static int GetResolution();
+    static int GetResolution() const;

 
     /**
         Set resolution (in pixels per inch) that will be used in PostScript
 
     /**
         Set resolution (in pixels per inch) that will be used in PostScript

diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h
index d2d19b570986f81511e2085a4bc7dca0a5c44e25..73b699d67d084e25ba337f8ff4307ade682a2f40 100644 (file)
--- a/interface/wx/dcsvg.h
+++ b/interface/wx/dcsvg.h
@@ -352,7 +352,7 @@ public:
     /**
         Not implemented.
     */
     /**
         Not implemented.
     */

-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height);
+    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const;

 
     //@{
     /**
 
     //@{
     /**

diff --git a/interface/wx/dde.h b/interface/wx/dde.h
index 296877496c793a8765519664f9d77fbd8c753271..99665bef22e0b2872c558b8bae4d5d5f61278bc5 100644 (file)
--- a/interface/wx/dde.h
+++ b/interface/wx/dde.h
@@ -11,8 +11,8 @@
 
     A wxDDEConnection object represents the connection between a client and a
     server. It can be created by making a connection using a wxDDEClient
 
     A wxDDEConnection object represents the connection between a client and a
     server. It can be created by making a connection using a wxDDEClient

-    object, or by the acceptance of a connection by a wxDDEServer object. The
-    bulk of a DDE (Dynamic Data Exchange) conversation is controlled by calling
+    object, or by the acceptance of a connection by a wxDDEServer object.
+    The bulk of a DDE (Dynamic Data Exchange) conversation is controlled by calling

     members in a wxDDEConnection object or by overriding its members.
 
     An application should normally derive a new connection class from
     members in a wxDDEConnection object or by overriding its members.
 
     An application should normally derive a new connection class from


@@ -25,6 +25,7 @@
 
     @library{wxbase}
     @category{ipc}
 
     @library{wxbase}
     @category{ipc}

+    @onlyfor{wxmsw}

 
     @see wxConnectionBase, wxDDEClient, wxDDEServer, @ref overview_ipc
 */
 
     @see wxConnectionBase, wxDDEClient, wxDDEServer, @ref overview_ipc
 */


@@ -222,6 +223,7 @@ public:
 
     @library{wxbase}
     @category{ipc}
 
     @library{wxbase}
     @category{ipc}

+    @onlyfor{wxmsw}

 
     @see wxDDEServer, wxDDEConnection, @ref overview_ipc
 */
 
     @see wxDDEServer, wxDDEConnection, @ref overview_ipc
 */


@@ -280,6 +282,7 @@ public:
 
     @library{wxbase}
     @category{ipc}
 
     @library{wxbase}
     @category{ipc}

+    @onlyfor{wxmsw}

 
     @see wxDDEClient, wxDDEConnection, @ref overview_ipc
 */
 
     @see wxDDEClient, wxDDEConnection, @ref overview_ipc
 */

diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h
index 0480e667f8715ef44d6c0d018c8260830199cd4f..702595a34c20a131842e722118664013e052a17f 100644 (file)
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -190,7 +190,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    bool CanDoLayoutAdaptation();
+    virtual bool CanDoLayoutAdaptation();

 
     /**
         Centres the dialog box on the display.
 
     /**
         Centres the dialog box on the display.


@@ -251,7 +251,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    bool DoLayoutAdaptation();
+    virtual bool DoLayoutAdaptation();

 
     /**
         This function is called when the titlebar OK button is pressed
 
     /**
         This function is called when the titlebar OK button is pressed


@@ -259,6 +259,8 @@ public:
         GetAffirmativeId() is sent by default. You can override this function.
         If the function returns @false, wxWidgets will call Close() for the
         dialog.
         GetAffirmativeId() is sent by default. You can override this function.
         If the function returns @false, wxWidgets will call Close() for the
         dialog.

+
+        @onlyfor{wxmsw}

     */
     virtual bool DoOK();
 
     */
     virtual bool DoOK();
 


@@ -362,6 +364,8 @@ public:
         supported.
 
         This function is not available on any other platform.
         supported.
 
         This function is not available on any other platform.

+
+        @onlyfor{wxmsw}

     */
     wxToolBar* GetToolBar() const;
 
     */
     wxToolBar* GetToolBar() const;
 


@@ -400,9 +404,11 @@ public:
         Returns @true if @a id is in the array of identifiers to be regarded as
         the main buttons for the non-scrolling area of a dialog.
 
         Returns @true if @a id is in the array of identifiers to be regarded as
         the main buttons for the non-scrolling area of a dialog.
 

+        @onlyfor{wxmsw}
+

         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    bool IsMainButton(wxWindowID& id) const;
+    bool IsMainButtonId(wxWindowID id) const;

 
     /**
         Returns @true if the dialog box is modal, @false otherwise.
 
     /**
         Returns @true if the dialog box is modal, @false otherwise.

diff --git a/interface/wx/display.h b/interface/wx/display.h
index cf116c9a9b8c6aae5c40ddd4fece6a4f1f865f26..682946576935143a85740b7e9beed5f0345083c1 100644 (file)
--- a/interface/wx/display.h
+++ b/interface/wx/display.h
@@ -70,12 +70,6 @@ public:
     */
     wxVideoMode GetCurrentMode() const;
 
     */
     wxVideoMode GetCurrentMode() const;
 

-    /**
-        Returns the bit depth of the display whose index was passed to the
-        constructor.
-    */
-    int GetDepth() const;
-

     /**
         Returns the index of the display on which the given point lies, or
         @c wxNOT_FOUND if the point is not on any connected display.
     /**
         Returns the index of the display on which the given point lies, or
         @c wxNOT_FOUND if the point is not on any connected display.

diff --git a/interface/wx/dynlib.h b/interface/wx/dynlib.h
index 5810f64b6abc816d8630cf860431f7947a9cfc9b..1651721c916705313d8ae566fe5fcb260345282b 100644 (file)
--- a/interface/wx/dynlib.h
+++ b/interface/wx/dynlib.h
@@ -166,6 +166,8 @@ public:
         function, you can use just the base name of the function and the
         correct suffix is appended automatically depending on the current
         build. Otherwise, this method is identical to GetSymbol().
         function, you can use just the base name of the function and the
         correct suffix is appended automatically depending on the current
         build. Otherwise, this method is identical to GetSymbol().

+
+        @onlyfor{wxmsw}

     */
     void* GetSymbolAorW(const wxString& name) const;
 
     */
     void* GetSymbolAorW(const wxString& name) const;
 

diff --git a/interface/wx/html/helpdlg.h b/interface/wx/html/helpdlg.h
index 6f7b824ca59a12f9955c05f671d75b7b19d722f2..36d94dbbd3e1a4a6d0b11ca6ee63677be410eb7c 100644 (file)
--- a/interface/wx/html/helpdlg.h
+++ b/interface/wx/html/helpdlg.h
@@ -53,14 +53,6 @@ public:
     */
     wxHtmlHelpController* GetController() const;
 
     */
     wxHtmlHelpController* GetController() const;
 

-    /**
-        Reads the user's settings for this dialog
-
-        @see wxHtmlHelpController::ReadCustomization
-    */
-    void ReadCustomization(wxConfigBase* cfg,
-                           const wxString& path = wxEmptyString);
-

     /**
         Sets the help controller associated with the dialog.
     */
     /**
         Sets the help controller associated with the dialog.
     */


@@ -72,13 +64,5 @@ public:
         @a format must contain exactly one "%s" (it will be replaced by the page title).
     */
     void SetTitleFormat(const wxString& format);
         @a format must contain exactly one "%s" (it will be replaced by the page title).
     */
     void SetTitleFormat(const wxString& format);

-
-    /**
-        Saves the user's settings for this dialog
-
-        @see wxHtmlHelpController::WriteCustomization
-    */
-    void WriteCustomization(wxConfigBase* cfg,
-                            const wxString& path = wxEmptyString);

 };
 
 };
 

diff --git a/interface/wx/html/helpfrm.h b/interface/wx/html/helpfrm.h
index 68153b12b29bc3bca9ef8cdd8414b064350a168a..0f298b0d7fdee5a9d90bda546f03f25c7f89f972 100644 (file)
--- a/interface/wx/html/helpfrm.h
+++ b/interface/wx/html/helpfrm.h
@@ -56,14 +56,6 @@ public:
     */
     wxHtmlHelpController* GetController() const;
 
     */
     wxHtmlHelpController* GetController() const;
 

-    /**
-        Reads the user's settings for this frame.
-
-        @see wxHtmlHelpController::ReadCustomization
-    */
-    void ReadCustomization(wxConfigBase* cfg,
-                           const wxString& path = wxEmptyString);
-

     /**
         Sets the help controller associated with the frame.
     */
     /**
         Sets the help controller associated with the frame.
     */


@@ -75,13 +67,5 @@ public:
         @a format must contain exactly one "%s" (it will be replaced by the page title).
     */
     void SetTitleFormat(const wxString& format);
         @a format must contain exactly one "%s" (it will be replaced by the page title).
     */
     void SetTitleFormat(const wxString& format);

-
-    /**
-        Saves the user's settings for this frame.
-
-        @see wxHtmlHelpController::WriteCustomization
-    */
-    void WriteCustomization(wxConfigBase* cfg,
-                            const wxString& path = wxEmptyString);

 };
 
 };
 

diff --git a/interface/wx/memory.h b/interface/wx/memory.h
index 88a86afca1afc81431eb835c7dd284de59a579a7..1162074d66aed157c1abe2c4f1cdc350beb429ba 100644 (file)
--- a/interface/wx/memory.h
+++ b/interface/wx/memory.h
@@ -80,37 +80,6 @@ public:
     */
     static int GetLevel();
 
     */
     static int GetLevel();
 

-    /**
-        Returns the output stream associated with the debug context.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-
-        @see SetStream()
-    */
-    ostream GetStream();
-
-    /**
-        Returns a pointer to the output stream buffer associated with the debug context.
-        There may not necessarily be a stream buffer if the stream has been set
-        by the user.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-    */
-    streambuf* GetStreamBuf();
-
-    /**
-        Returns @true if there is a stream currently associated
-        with the debug context.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-
-        @see SetStream(), GetStream()
-    */
-    bool HasStream();
-

     /**
         Prints a list of the classes declared in this application, giving derivation
         and whether instances of this class can be dynamically created.
     /**
         Prints a list of the classes declared in this application, giving derivation
         and whether instances of this class can be dynamically created.


@@ -167,15 +136,6 @@ public:
     */
     static void SetDebugMode(bool debug);
 
     */
     static void SetDebugMode(bool debug);
 

-    /**
-        Sets the current debug file and creates a stream.
-        This will delete any existing stream and stream buffer.
-
-        By default, the debug context stream outputs to the debugger (Windows)
-        or standard error (other platforms).
-    */
-    bool SetFile(const wxString& filename);
-

     /**
         Sets the debug level (default 1).
 
     /**
         Sets the debug level (default 1).
 


@@ -199,31 +159,6 @@ public:
         The shutdown function must be take no parameters and return nothing.
     */
     static void SetShutdownNotifyFunction(wxShutdownNotifyFunction func);
         The shutdown function must be take no parameters and return nothing.
     */
     static void SetShutdownNotifyFunction(wxShutdownNotifyFunction func);

-
-    /**
-        Sets the debugging stream to be the debugger (Windows) or standard error (other
-        platforms).
-
-        This is the default setting. The existing stream will be flushed and deleted.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-    */
-    bool SetStandardError();
-
-    /**
-        Sets the stream and optionally, stream buffer associated with the debug context.
-        This operation flushes and deletes the existing stream (and stream buffer if any).
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-
-        @param stream
-            Stream to associate with the debug context. Do not set this to @NULL.
-        @param streamBuf
-            Stream buffer to associate with the debug context.
-    */
-    void SetStream(ostream* stream, streambuf* streamBuf = NULL);

 };
 
 
 };
 
 

diff --git a/interface/wx/object.h b/interface/wx/object.h
index 55814598ef11635c0d5e8aedde23424d53eb33f8..c415056d0e4d57b7b677ae827492e508dc51bd15 100644 (file)
--- a/interface/wx/object.h
+++ b/interface/wx/object.h
@@ -202,25 +202,6 @@ public:
     */
     virtual ~wxObject();
 
     */
     virtual ~wxObject();
 

-    /**
-        A virtual function that may be redefined by derived classes to allow dumping of
-        memory states.
-
-        This function is only defined in debug build and exists only if @c __WXDEBUG__
-        is defined.
-
-        @param stream
-            Stream on which to output dump information.
-
-        @remarks Currently wxWidgets does not define Dump() for derived classes,
-                 but programmers may wish to use it for their own applications.
-                 Be sure to call the Dump member of the class's base class to allow all
-                 information to be dumped.
-                 The implementation of this function in wxObject just writes
-                 the class name of the object.
-    */
-    void Dump(ostream& stream);
-

     /**
         This virtual function is redefined for every class that requires run-time
         type information, when using the ::DECLARE_CLASS macro (or similar).
     /**
         This virtual function is redefined for every class that requires run-time
         type information, when using the ::DECLARE_CLASS macro (or similar).

diff --git a/interface/wx/printdlg.h b/interface/wx/printdlg.h
index bdd743179dd22339f3f867ef859cb4b387d836ef..a02e924c55b419876019eb4d56ed416d76d9ec5f 100644 (file)
--- a/interface/wx/printdlg.h
+++ b/interface/wx/printdlg.h
@@ -121,6 +121,6 @@ public:
         Shows the dialog, returning @c wxID_OK if the user pressed OK, and
         @c wxID_CANCEL otherwise.
     */
         Shows the dialog, returning @c wxID_OK if the user pressed OK, and
         @c wxID_CANCEL otherwise.
     */

-    virtual int ShowModal();
+    int ShowModal();

 };
 
 };
 

diff --git a/interface/wx/socket.h b/interface/wx/socket.h
index 0c7b0eceaee9ddb7a3b1f2a3d9c8aae03e16b16c..0a7d42ba8e00b6a9606da14c213410efe769f7d7 100644 (file)
--- a/interface/wx/socket.h
+++ b/interface/wx/socket.h
@@ -257,12 +257,12 @@ public:
 
         @return @true on success, @false if something goes wrong (invalid @a service).
     */
 
         @return @true on success, @false if something goes wrong (invalid @a service).
     */

-    virtual bool Service(unsigned short service);
+    virtual bool Service(unsigned short service) = 0;

 
     /**
         Returns the current service.
     */
 
     /**
         Returns the current service.
     */

-    virtual unsigned short Service() const;
+    virtual unsigned short Service() const = 0;

 };
 
 
 };
 
 

diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index f936debde1625843abe0273f409fc3fa37e57408..e5e895d41067e789ec9f794f3bfa37dc804bb651 100644 (file)
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -331,10 +331,10 @@ public:
     */
     wxStyledTextCtrl::wxStyledTextCtrl(wxWindow* parent,
                                        wxWindowID id = wxID_ANY,
     */
     wxStyledTextCtrl::wxStyledTextCtrl(wxWindow* parent,
                                        wxWindowID id = wxID_ANY,

-                                       const wxPoint pos = wxDefaultPosition,
-                                       const wxSize size = wxDefaultSize,
+                                       const wxPoint& pos = wxDefaultPosition,
+                                       const wxSize& size = wxDefaultSize,

                                        long style = 0,
                                        long style = 0,

-                                       const wxString name = "stcwindow");
+                                       const wxString& name = wxSTCNameStr);

 
     /**
         Extend life of document.
 
     /**
         Extend life of document.


@@ -597,7 +597,7 @@ public:
     /**
         Will a paste succeed?
     */
     /**
         Will a paste succeed?
     */

-    bool CanPaste();
+    virtual bool CanPaste() const;

 
     /**
         Are there any redoable actions in the undo history?
 
     /**
         Are there any redoable actions in the undo history?

diff --git a/interface/wx/thread.h b/interface/wx/thread.h
index 2007458cf054585d7c83e2e6b1e50370dce38fcf..ae197ca0f230aea6845cd2347011c931556c912f 100644 (file)
--- a/interface/wx/thread.h
+++ b/interface/wx/thread.h
@@ -303,7 +303,7 @@ public:
     /**
         This constructor simply initializes a member variable.
     */
     /**
         This constructor simply initializes a member variable.
     */

-    wxThreadHelper();
+    wxThreadHelper(wxThreadKind kind = wxTHREAD_JOINABLE);

 
     /**
         The destructor frees the resources associated with the thread.
 
     /**
         The destructor frees the resources associated with the thread.