several mac fixes (Mark Newsams patches)

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

include/wx/mac/choice.h

@@ -83,6 +83,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:
+    virtual wxSize DoGetBestSize() const ;
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );

include/wx/mac/control.h

@@ -75,7 +75,7 @@ public:
    virtual void 	 MacSuperShown( bool show ) ;
    virtual bool		 MacCanFocus() const ;
    
-   virtual void  	 DoSetSize(int x, int y,int width, int height,int sizeFlags ) ;
+   virtual void  	 DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
    virtual void 	 OnKeyDown( wxKeyEvent &event ) ;
    virtual void		 OnMouseEvent( wxMouseEvent &event ) ;
    virtual void 	 OnPaint(wxPaintEvent& event) ;

include/wx/mac/notebook.h

@@ -80,11 +80,11 @@ public:
 
   // control the appearance of the notebook pages
     // set the size (the same for all pages)
-  void SetPageSize(const wxSize& size);
+  virtual void SetPageSize(const wxSize& size);
     // set the padding between tabs (in pixels)
-  void SetPadding(const wxSize& padding);
+  virtual void SetPadding(const wxSize& padding);
     // sets the size of the tabs (assumes all tabs are the same size)
-  void SetTabSize(const wxSize& sz);
+  virtual void SetTabSize(const wxSize& sz);
 
 /*
     // get number of pages in the dialog

include/wx/mac/radiobox.h

@@ -80,6 +80,7 @@ protected:
 	int               m_noRowsOrCols;
 
 // Internal functions 
+    virtual wxSize DoGetBestSize() const ;
 	virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

include/wx/mac/slider.h

@@ -53,7 +53,6 @@ public:
 
   virtual int GetValue() const ;
   virtual void SetValue(int);
-  bool Show(bool show);
 
   void SetRange(int minValue, int maxValue);
 
@@ -76,9 +75,20 @@ public:
   int GetThumbLength() const ;
   void SetTick(int tickPos) ;
 
+ 
+     // set min/max size of the slider
+     virtual void SetSizeHints( int minW, int minH,
+                                int maxW = -1, int maxH = -1,
+                                int incW = -1, int incH = -1 );
+ 
+   protected:
+     virtual wxSize DoGetBestSize() const;
+     virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags);
+     virtual void   DoMoveWindow(int x, int y, int w, int h);
+ 
   void Command(wxCommandEvent& event);
 	void 					MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
- protected:
+
  	wxStaticText*	m_macMinimumStatic ;
  	wxStaticText*	m_macMaximumStatic ;
  	wxStaticText*	m_macValueStatic ;
@@ -88,6 +98,7 @@ public:
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;
+private :
 DECLARE_EVENT_TABLE()
 };
 

include/wx/mac/statbmp.h

@@ -58,7 +58,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
-  wxSize DoGetBestSize() const ;
+  virtual  wxSize DoGetBestSize() const ;
 
  protected:
   wxBitmap m_bitmap;

include/wx/mac/stattext.h

@@ -48,7 +48,7 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
   void DrawParagraph(wxDC &dc, wxString paragraph);
   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;
-  wxSize DoGetBestSize() const ;
+  virtual wxSize DoGetBestSize() const ;
   virtual bool AcceptsFocus() const { return FALSE; }
  private :
  	wxString	m_label ;