Some edits to OGL; tweaks to wxClipboard docs

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

distrib/msw/generic.rsp

@@ -1051,3 +1051,12 @@ samples/life/*.txt
 samples/life/bitmaps/*.xpm
 samples/life/bitmaps/*.bmp
 
+samples/calendar/*.cpp
+samples/calendar/*.h
+samples/calendar/makefile*
+samples/calendar/*.rc
+samples/calendar/*.def
+samples/calendar/*.ico
+samples/calendar/*.xpm
+samples/calendar/*.txt
+

distrib/msw/makefile.rsp

@@ -50,6 +50,7 @@ samples/font/Makefile.in
 samples/menu/Makefile.in
 samples/console/Makefile.in
 samples/life/Makefile.in
+samples/calendar/Makefile.in
 utils/glcanvas/motif/Makefile.in
 utils/Makefile.in
 utils/wxMMedia2/Makefile.in

distrib/msw/zipdist.bat

@@ -5,7 +5,7 @@ set dest=%src\deliver
 set wise=0
 
 Rem Set this to the required version
-set version=2_1_11
+set version=2_1_12
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage

docs/latex/wx/clipbrd.tex

@@ -64,6 +64,20 @@ Constructor.
 
 Destructor.
 
+\membersection{wxClipboard::AddData}\label{wxclipboardadddata}
+
+\func{bool}{AddData}{\param{wxDataObject*}{ data}}
+
+Call this function to add the data object to the clipboard. You may call
+this function repeatedly after having cleared the clipboard using \helpref{wxClipboard::Clear}{wxclipboardclear}.
+
+After this function has been called, the clipboard owns the data, so do not delete
+the data explicitly.
+
+\wxheading{See also}
+
+\helpref{wxClipboard::SetData}{wxclipboardsetdata}
+
 \membersection{wxClipboard::Clear}\label{wxclipboardclear}
 
 \func{void}{Clear}{\void}
@@ -83,6 +97,12 @@ Call this function to close the clipboard, having opened it with \helpref{wxClip
 Call this function to fill {\it data} with data on the clipboard, if available in the required
 format. Returns TRUE on success.
 
+\membersection{wxClipboard::IsOpened}\label{wxclipboardisopened}
+
+\constfunc{bool}{IsOpened}{\void}
+
+Returns TRUE if the clipboard has been opened.
+
 \membersection{wxClipboard::IsSupported}\label{wxclipboardissupported}
 
 \func{bool}{IsSupported}{\param{const wxDataFormat\&}{ format}}
@@ -109,6 +129,13 @@ Call this function to set the data object to the clipboard. This function will
 clear all previous contents in the clipboard, so calling it several times
 does not make any sense.
 
+After this function has been called, the clipboard owns the data, so do not delete
+the data explicitly.
+
+\wxheading{See also}
+
+\helpref{wxClipboard::AddData}{wxclipboardadddata}
+
 \membersection{wxClipboard::UsePrimarySelection}\label{wxclipboarduseprimary}
 
 \func{void}{UsePrimarySelection}{\param{bool}{ primary = TRUE}}

utils/ogl/src/basic.cpp

@@ -884,7 +884,7 @@ void wxShape::FindRegionNames(wxStringList& list)
 void wxShape::AssignNewIds()
 {
 //  if (m_id == 0)
-  m_id = NewId();
+  m_id = wxNewId();
   wxNode *node = m_children.First();
   while (node)
   {
@@ -1878,7 +1878,7 @@ void wxShape::WriteRegions(wxExpr *clause)
 void wxShape::ReadAttributes(wxExpr *clause)
 {
   clause->GetAttributeValue("id", m_id);
-  RegisterId(m_id);
+  wxRegisterId(m_id);
 
   clause->GetAttributeValue("x", m_xpos);
   clause->GetAttributeValue("y", m_ypos);

utils/ogl/src/composit.cpp

@@ -374,7 +374,7 @@ void wxCompositeShape::Copy(wxShape& copy)
     wxShape *object = (wxShape *)node->Data();
     wxShape *newObject = object->CreateNewCopy(FALSE, FALSE);
     if (newObject->GetId() == 0)
-      newObject->SetId(NewId());
+      newObject->SetId(wxNewId());
 
     newObject->SetParent(&compositeCopy);
     compositeCopy.m_children.Append(newObject);
@@ -457,7 +457,7 @@ wxOGLConstraint *wxCompositeShape::AddConstraint(wxOGLConstraint *constraint)
 {
   m_constraints.Append(constraint);
   if (constraint->m_constraintId == 0)
-    constraint->m_constraintId = NewId();
+    constraint->m_constraintId = wxNewId();
   return constraint;
 }
 
@@ -465,7 +465,7 @@ wxOGLConstraint *wxCompositeShape::AddConstraint(int type, wxShape *constraining
 {
   wxOGLConstraint *constraint = new wxOGLConstraint(type, constraining, constrained);
   if (constraint->m_constraintId == 0)
-    constraint->m_constraintId = NewId();
+    constraint->m_constraintId = wxNewId();
   m_constraints.Append(constraint);
   return constraint;
 }
@@ -476,7 +476,7 @@ wxOGLConstraint *wxCompositeShape::AddConstraint(int type, wxShape *constraining
   l.Append(constrained);
   wxOGLConstraint *constraint = new wxOGLConstraint(type, constraining, l);
   if (constraint->m_constraintId == 0)
-    constraint->m_constraintId = NewId();
+    constraint->m_constraintId = wxNewId();
   m_constraints.Append(constraint);
   return constraint;
 }
@@ -1582,7 +1582,7 @@ public:
 
     void OnMenu(wxCommandEvent& event);
 
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(OGLPopupDivisionMenu, wxMenu)

utils/ogl/src/lines.cpp

@@ -1566,9 +1566,9 @@ void wxLineShape::ReadAttributes(wxExpr *clause)
         arrowId = id_expr->IntegerValue();
 
       if (arrowId == -1)
-        arrowId = NewId();
+        arrowId = wxNewId();
       else
-        RegisterId(arrowId);
+        wxRegisterId(arrowId);
 
       wxArrowHead *arrowHead = AddArrow(arrowType, arrowEnd, arrowSize, xOffset, (char*) (const char*) arrowName, NULL, arrowId);
       if (yOffsetExpr)
@@ -2356,7 +2356,7 @@ wxArrowHead::wxArrowHead(WXTYPE type, int end, double size, double dist, const w
   m_metaFile = mf;
   m_id = arrowId;
   if (m_id == -1)
-    m_id = NewId();
+    m_id = wxNewId();
 }
 
 wxArrowHead::wxArrowHead(wxArrowHead& toCopy)
@@ -2371,7 +2371,7 @@ wxArrowHead::wxArrowHead(wxArrowHead& toCopy)
     m_metaFile = new wxPseudoMetaFile(*(toCopy.m_metaFile));
   else
     m_metaFile = NULL;
-  m_id = NewId();
+  m_id = wxNewId();
 }
 
 wxArrowHead::~wxArrowHead()

utils/ogl/src/ogldiag.cpp

@@ -324,7 +324,7 @@ bool wxDiagram::LoadFile(const wxString& filename)
     wxExpr *clause = (wxExpr *)node->Data();
     long id = -1;
     clause->GetAttributeValue("id", id);
-    RegisterId(id);
+    wxRegisterId(id);
     node = node->Next();
   }