src/windows/native/sun/windows/awt_Button.cpp

rev 12527 : 8165543: Better window framing
Reviewed-by: serb

*** 63,72 ****
--- 63,73 ----
  }
  
  /* Create a new AwtButton object and window. */
  AwtButton* AwtButton::Create(jobject self, jobject parent)
  {
+     DASSERT(AwtToolkit::IsMainThread());
      JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
  
      /* the result */
      AwtButton *c = NULL;
  
*** 86,96 ****
          PDATA pData;
          AwtCanvas* awtParent;
  
          JNI_CHECK_PEER_GOTO(parent, done);
          awtParent = (AwtCanvas*)pData;
-         JNI_CHECK_NULL_GOTO(awtParent, "awtParent", done);
  
          target = env->GetObjectField(self, AwtObject::targetID);
          JNI_CHECK_NULL_GOTO(target, "target", done);
  
          c = new AwtButton();
--- 87,96 ----
*** 372,384 ****
  Java_sun_awt_windows_WButtonPeer_setLabel(JNIEnv *env, jobject self,
                                            jstring label)
  {
      TRY;
  
-     PDATA pData;
-     JNI_CHECK_PEER_RETURN(self);
- 
      SetLabelStruct *sls = new SetLabelStruct;
      sls->button = env->NewGlobalRef(self);
      sls->label = (label != NULL) ? (jstring)env->NewGlobalRef(label) : NULL;
  
      AwtToolkit::GetInstance().SyncCall(AwtButton::_SetLabel, sls);
--- 372,381 ----
*** 396,412 ****
  Java_sun_awt_windows_WButtonPeer_create(JNIEnv *env, jobject self,
                                          jobject parent)
  {
      TRY;
  
-     PDATA pData;
-     JNI_CHECK_PEER_RETURN(parent);
- 
      AwtToolkit::CreateComponent(
          self, parent, (AwtToolkit::ComponentFactory)AwtButton::Create);
  
-     JNI_CHECK_PEER_CREATION_RETURN(self);
- 
      CATCH_BAD_ALLOC;
  }
  
  }  /* extern "C" */
--- 393,404 ----